Skip to content

Throw Auth in count and Sum methods - Remove order queries too #769

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 6 commits into from
Dec 2, 2025
Merged

Throw Auth in count and Sum methods - Remove order queries too #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16e7811
count POC
fogelito Dec 1, 2025
d6e96ed
auth + vecotor changes
fogelito Dec 1, 2025
b10ed40
stopOnFailure
fogelito Dec 1, 2025
1bb20de
Merge branch 'main' of github.com:utopia-php/database into count-with…
fogelito Dec 1, 2025
40900c4
Revert events
fogelito Dec 1, 2025
b5e3d1d
Remove vector in sum
fogelito Dec 1, 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
37 changes: 2 additions & 35 deletions src/Database/Adapter/SQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2963,7 +2963,6 @@ protected function convertArrayToWKT(array $geometry): string
*/
public function find(Document $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
{
$attributes = $collection->getAttribute('attributes', []);
$collection = $collection->getId();
$name = $this->filter($collection);
$roles = $this->authorization->getRoles();
Expand Down Expand Up @@ -3180,7 +3179,6 @@ public function find(Document $collection, array $queries = [], ?int $limit = 25
*/
public function count(Document $collection, array $queries = [], ?int $max = null): int
{
$attributes = $collection->getAttribute("attributes", []);
$collection = $collection->getId();
$name = $this->filter($collection);
$roles = $this->authorization->getRoles();
Expand All @@ -3196,13 +3194,9 @@ public function count(Document $collection, array $queries = [], ?int $max = nul

$queries = array_map(fn ($query) => clone $query, $queries);

// Extract vector queries (used for ORDER BY) and keep non-vector for WHERE
$vectorQueries = [];
$otherQueries = [];
foreach ($queries as $query) {
if (in_array($query->getMethod(), Query::VECTOR_TYPES)) {
$vectorQueries[] = $query;
} else {
if (!in_array($query->getMethod(), Query::VECTOR_TYPES)) {
$otherQueries[] = $query;
}
}
Expand All @@ -3225,22 +3219,11 @@ public function count(Document $collection, array $queries = [], ?int $max = nul
? 'WHERE ' . \implode(' AND ', $where)
: '';

// Add vector distance calculations to ORDER BY (similarity-aware LIMIT)
$vectorOrders = [];
foreach ($vectorQueries as $query) {
$vectorOrder = $this->getVectorDistanceOrder($query, $binds, $alias);
if ($vectorOrder) {
$vectorOrders[] = $vectorOrder;
}
}
$sqlOrder = !empty($vectorOrders) ? 'ORDER BY ' . implode(', ', $vectorOrders) : '';

$sql = "
SELECT COUNT(1) as sum FROM (
SELECT 1
FROM {$this->getSQLTable($name)} AS {$this->quote($alias)}
{$sqlWhere}
{$sqlOrder}
{$limit}
) table_count
";
Expand Down Expand Up @@ -3277,7 +3260,6 @@ public function count(Document $collection, array $queries = [], ?int $max = nul
*/
public function sum(Document $collection, string $attribute, array $queries = [], ?int $max = null): int|float
{
$collectionAttributes = $collection->getAttribute("attributes", []);
$collection = $collection->getId();
$name = $this->filter($collection);
$attribute = $this->filter($attribute);
Expand All @@ -3294,13 +3276,9 @@ public function sum(Document $collection, string $attribute, array $queries = []

$queries = array_map(fn ($query) => clone $query, $queries);

// Extract vector queries (used for ORDER BY) and keep non-vector for WHERE
$vectorQueries = [];
$otherQueries = [];
foreach ($queries as $query) {
if (in_array($query->getMethod(), Query::VECTOR_TYPES)) {
$vectorQueries[] = $query;
} else {
if (!in_array($query->getMethod(), Query::VECTOR_TYPES)) {
$otherQueries[] = $query;
}
}
Expand All @@ -3323,22 +3301,11 @@ public function sum(Document $collection, string $attribute, array $queries = []
? 'WHERE ' . \implode(' AND ', $where)
: '';

// Add vector distance calculations to ORDER BY (similarity-aware LIMIT)
$vectorOrders = [];
foreach ($vectorQueries as $query) {
$vectorOrder = $this->getVectorDistanceOrder($query, $binds, $alias);
if ($vectorOrder) {
$vectorOrders[] = $vectorOrder;
}
}
$sqlOrder = !empty($vectorOrders) ? 'ORDER BY ' . implode(', ', $vectorOrders) : '';

$sql = "
SELECT SUM({$this->quote($attribute)}) as sum FROM (
SELECT {$this->quote($attribute)}
FROM {$this->getSQLTable($name)} AS {$this->quote($alias)}
{$sqlWhere}
{$sqlOrder}
{$limit}
) table_count
";
Expand Down
12 changes: 11 additions & 1 deletion src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7729,7 +7729,6 @@ public function find(string $collection, array $queries = [], string $forPermiss
$documentSecurity = $collection->getAttribute('documentSecurity', false);
$skipAuth = $this->authorization->isValid(new Input($forPermission, $collection->getPermissionsByType($forPermission)));


if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($this->authorization->getDescription());
}
Expand Down Expand Up @@ -7963,7 +7962,13 @@ public function count(string $collection, array $queries = [], ?int $max = null)
}
}

$documentSecurity = $collection->getAttribute('documentSecurity', false);
$skipAuth = $this->authorization->isValid(new Input(self::PERMISSION_READ, $collection->getRead()));

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($this->authorization->getDescription());
}

$relationships = \array_filter(
$collection->getAttribute('attributes', []),
fn (Document $attribute) => $attribute->getAttribute('type') === self::VAR_RELATIONSHIP
Expand Down Expand Up @@ -8025,8 +8030,13 @@ public function sum(string $collection, string $attribute, array $queries = [],
}
}

$documentSecurity = $collection->getAttribute('documentSecurity', false);
$skipAuth = $this->authorization->isValid(new Input(self::PERMISSION_READ, $collection->getRead()));

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($this->authorization->getDescription());
}

$relationships = \array_filter(
$collection->getAttribute('attributes', []),
fn (Document $attribute) => $attribute->getAttribute('type') === self::VAR_RELATIONSHIP
Expand Down
10 changes: 6 additions & 4 deletions tests/e2e/Adapter/Scopes/PermissionTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,12 @@ public function testCollectionPermissionsCountThrowsException(array $data): void
/** @var Database $database */
$database = $this->getDatabase();

$count = $database->count(
$collection->getId()
);
$this->assertEmpty($count);
try {
$database->count($collection->getId());
$this->fail('Failed to throw exception');
} catch (\Throwable $th) {
$this->assertInstanceOf(AuthorizationException::class, $th);
}
}

/**
Expand Down