Skip to content

$sequence cast empty string issue#617

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

Merged
abnegate merged 10 commits into from
Jul 31, 2025
Merged

$sequence cast empty string issue #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f09ff81
Remove old logic
fogelito Jul 8, 2025
947ac53
Comment option 2
fogelito Jul 8, 2025
1f1a972
formatting
fogelito Jul 8, 2025
0814554
Merge branch 'main' of github.com:utopia-php/database into cast-sequence
fogelito Jul 29, 2025
749cb06
Set test
fogelito Jul 29, 2025
b6ac173
Revert convert queries
fogelito Jul 31, 2025
53f4ffd
Remove comment
fogelito Jul 31, 2025
26a4dd7
Fix tests
fogelito Jul 31, 2025
0e2549d
line
fogelito Jul 31, 2025
0dc4b12
Merge branch 'main' of github.com:utopia-php/database into cast-sequence
fogelito Jul 31, 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
16 changes: 4 additions & 12 deletions src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1558,11 +1558,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
try {
$stmt = $this->getPDO()->prepare($sql);
foreach ($binds as $key => $value) {
if ($key === ":sequence") {
$stmt->bindValue($key, $value, PDO::PARAM_INT);
} else {
$stmt->bindValue($key, $value, $this->getPDOType($value));
}
$stmt->bindValue($key, $value, $this->getPDOType($value));
}

$this->execute($stmt);
Expand DownExpand Up@@ -1822,13 +1818,9 @@ protected function getSQLCondition(Query $query, array &$binds): string
Query::TYPE_CONTAINS => $query->onArray() ? \json_encode($value) : '%' . $this->escapeWildcards($value) . '%',
default => $value
};
if ($attribute === $this->quote("_id")) {
$binds[":sequence"] = $value;
$conditions[] = "{$alias}.{$attribute} {$operator} :sequence";
} else {
$binds[":{$placeholder}_{$key}"] = $value;
$conditions[] = "{$alias}.{$attribute} {$operator} :{$placeholder}_{$key}";
}

$binds[":{$placeholder}_{$key}"] = $value;
$conditions[] = "{$alias}.{$attribute} {$operator} :{$placeholder}_{$key}";
}

return empty($conditions) ? '' : '(' . implode(' OR ', $conditions) . ')';
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1845,6 +1845,9 @@ public function testFindByInternalID(array $data): void
]);

$this->assertEquals(1, count($documents));

$empty = new Document();
$this->assertEquals('', $empty->getSequence());
}

public function testFindOrderBy(): void
Expand Down