Skip to content

cursor before logic #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fogelito wants to merge 8 commits into
base: main
Choose a base branch
from
Open

cursor before logic #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
974b84a
cursor before logic
fogelito Jul 3, 2025
aea7281
Merge branch 'main' of github.com:utopia-php/database into fix-cursor
fogelito Jul 3, 2025
9a46394
fix in_array
fogelito Jul 3, 2025
4ee647b
stopOnFailure
fogelito Jul 3, 2025
f520373
Postgres remove reverse
fogelito Jul 3, 2025
c3daf68
line
fogelito Jul 3, 2025
85b7ff6
Remove comment
fogelito Jul 3, 2025
95f7952
Merge branch 'main' of github.com:utopia-php/database into fix-cursor
fogelito Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Database/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,12 +774,11 @@ abstract public function deleteDocuments(string $collection, array $sequences, a
* @param array<string> $orderAttributes
* @param array<string> $orderTypes
* @param array<string, mixed> $cursor
* @param string $cursorDirection
* @param string $forPermission
*
* @return array<Document>
*/
abstract public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array;
abstract public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $forPermission = Database::PERMISSION_READ): array;

/**
* Sum an attribute
Expand Down
26 changes: 3 additions & 23 deletions src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,14 +1483,13 @@ public function deleteDocument(string $collection, string $id): bool
* @param array<string> $orderAttributes
* @param array<string> $orderTypes
* @param array<string, mixed> $cursor
* @param string $cursorDirection
* @param string $forPermission
* @return array<Document>
* @throws DatabaseException
* @throws TimeoutException
* @throws Exception
*/
public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array
public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $forPermission = Database::PERMISSION_READ): array
{
$name = $this->filter($collection);
$roles = Authorization::getRoles();
Expand All @@ -1508,24 +1507,14 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$attribute = $this->filter($attribute);

$orderType = $this->filter($orderTypes[$i] ?? Database::ORDER_ASC);
$direction = $orderType;

if ($cursorDirection === Database::CURSOR_BEFORE) {
$direction = ($direction === Database::ORDER_ASC)
? Database::ORDER_DESC
: Database::ORDER_ASC;
}
$orders[] = "{$this->quote($attribute)} {$orderType}";

$orders[] = "{$this->quote($attribute)} {$direction}";
$operator = ($orderType === Database::ORDER_DESC) ? Query::TYPE_LESSER : Query::TYPE_GREATER;

// Build pagination WHERE clause only if we have a cursor
if (!empty($cursor)) {
// Special case: No tie breaks. only 1 attribute and it's a unique primary key
if (count($orderAttributes) === 1 && $i === 0 && $originalAttribute === '$sequence') {
$operator = ($direction === Database::ORDER_DESC)
? Query::TYPE_LESSER
: Query::TYPE_GREATER;

$bindName = ":cursor_pk";
$binds[$bindName] = $cursor[$originalAttribute];

Expand All @@ -1546,11 +1535,6 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$conditions[] = "{$this->quote($alias)}.{$this->quote($prevAttr)} = {$bindName}";
}

// Add comparison for current attribute
$operator = ($direction === Database::ORDER_DESC)
? Query::TYPE_LESSER
: Query::TYPE_GREATER;

$bindName = ":cursor_{$i}";
$binds[$bindName] = $cursor[$originalAttribute];

Expand Down Expand Up @@ -1648,10 +1632,6 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$results[$index] = new Document($results[$index]);
}

if ($cursorDirection === Database::CURSOR_BEFORE) {
$results = \array_reverse($results);
}

return $results;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Database/Adapter/Pool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public function deleteDocuments(string $collection, array $sequences, array $per
return $this->delegate(__FUNCTION__, \func_get_args());
}

public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array
public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $forPermission = Database::PERMISSION_READ): array
{
return $this->delegate(__FUNCTION__, \func_get_args());
}
Expand Down
29 changes: 4 additions & 25 deletions src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,14 +1382,13 @@ public function deleteDocument(string $collection, string $id): bool
* @param array<string> $orderAttributes
* @param array<string> $orderTypes
* @param array<string, mixed> $cursor
* @param string $cursorDirection
* @param string $forPermission
* @return array<Document>
* @throws DatabaseException
* @throws TimeoutException
* @throws Exception
*/
public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array
public function find(string $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $forPermission = Database::PERMISSION_READ): array
{
$name = $this->filter($collection);
$roles = Authorization::getRoles();
Expand All @@ -1407,27 +1406,16 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$attribute = $this->filter($attribute);

$orderType = $this->filter($orderTypes[$i] ?? Database::ORDER_ASC);
$direction = $orderType;

if ($cursorDirection === Database::CURSOR_BEFORE) {
$direction = ($direction === Database::ORDER_ASC)
? Database::ORDER_DESC
: Database::ORDER_ASC;
}
$orders[] = "{$this->quote($attribute)} {$orderType}";

$orders[] = "{$this->quote($attribute)} {$direction}";
$operator = ($orderType === Database::ORDER_DESC) ? Query::TYPE_LESSER : Query::TYPE_GREATER;

// Build pagination WHERE clause only if we have a cursor
if (!empty($cursor)) {
// Special case: only 1 attribute and it's a unique primary key
// Special case: No tie breaks. only 1 attribute and it's a unique primary key
if (count($orderAttributes) === 1 && $i === 0 && $originalAttribute === '$sequence') {
$operator = ($direction === Database::ORDER_DESC)
? Query::TYPE_LESSER
: Query::TYPE_GREATER;

$bindName = ":cursor_pk";
$binds[$bindName] = $cursor[$originalAttribute];

$cursorWhere[] = "{$this->quote($alias)}.{$this->quote($attribute)} {$this->getSQLOperator($operator)} {$bindName}";
break;
}
Expand All @@ -1445,11 +1433,6 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$conditions[] = "{$this->quote($alias)}.{$this->quote($prevAttr)} = {$bindName}";
}

// Add comparison for current attribute
$operator = ($direction === Database::ORDER_DESC)
? Query::TYPE_LESSER
: Query::TYPE_GREATER;

$bindName = ":cursor_{$i}";
$binds[$bindName] = $cursor[$originalAttribute];

Expand Down Expand Up @@ -1550,10 +1533,6 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
$results[$index] = new Document($results[$index]);
}

if ($cursorDirection === Database::CURSOR_BEFORE) {
$results = \array_reverse($results);
}

return $results;
}

Expand Down
34 changes: 17 additions & 17 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6034,25 +6034,22 @@ public function find(string $collection, array $queries = [], string $forPermiss
$cursor = $grouped['cursor'];
$cursorDirection = $grouped['cursorDirection'] ?? Database::CURSOR_AFTER;

$uniqueOrderBy = false;
foreach ($orderAttributes as $order) {
if ($order === '$id' || $order === '$sequence') {
$uniqueOrderBy = true;
}
}

if ($uniqueOrderBy === false) {
if (!in_array('$id', $orderAttributes) && !in_array('$sequence', $orderAttributes)) {
$orderAttributes[] = '$sequence';
}

if (!empty($cursor)) {
foreach ($orderAttributes as $order) {
if ($cursor->getAttribute($order) === null) {
throw new OrderException(
message: "Order attribute '{$order}' is empty",
attribute: $order
);
}
foreach ($orderAttributes as $i => $order) {
if (!empty($cursor) && $cursor->getAttribute($order) === null) {
throw new OrderException(
message: "Order attribute '{$order}' is empty",
attribute: $order
);
}

$orderTypes[$i] = $orderTypes[$i] ?? Database::ORDER_ASC;

if ($cursorDirection === Database::CURSOR_BEFORE) {
$orderTypes[$i] = ($orderTypes[$i] === Database::ORDER_ASC) ? Database::ORDER_DESC : Database::ORDER_ASC;
}
}

Expand Down Expand Up @@ -6122,12 +6119,15 @@ public function find(string $collection, array $queries = [], string $forPermiss
$orderAttributes,
$orderTypes,
$cursor,
$cursorDirection,
$forPermission
);

$results = $skipAuth ? Authorization::skip($getResults) : $getResults();

if ($cursorDirection === Database::CURSOR_BEFORE) {
$results = \array_reverse($results);
}

foreach ($results as &$node) {
if ($this->resolveRelationships && (empty($selects) || !empty($nestedSelections))) {
$node = $this->silent(fn () => $this->populateDocumentRelationships($collection, $node, $nestedSelections));
Expand Down