CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-02 18:26:49 +13:00
Code Issues Projects Releases Wiki Activity

query validators ignore nested

Browse source
This commit is contained in:
fogelito 2023-03-21 14:32:05 +02:00
parent a5f3af62bd
commit e06e890279
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/api/databases.php
View file

@ -2680,7 +2680,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
}
$filterQueries = Query::groupByType($queries)['filters'];
// todo: temporary fix until Utopia will be ready !!!!
foreach ($filterQueries as $key => $query) {
if (\str_contains($query->getAttribute(), '.')) {
unset($filterQueries[$key]);
}
}
if ($documentSecurity && !$valid) {
$documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
$total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT);

5
src/Appwrite/Utopia/Database/Validator/Queries.php
View file

@ -57,8 +57,11 @@ class Queries extends Validator
if (!$query instanceof Query) {
try {
$query = Query::parse($query);
if (\str_contains($query->getAttribute(), '.')) {
return true;
}
} catch (\Throwable $th) {
$this->message = 'Invalid query: ${query}';
$this->message = "Invalid query: {$query}";
return false;
}
}

31
tests/e2e/Services/Databases/DatabasesBase.php
View file

@ -321,7 +321,6 @@ trait DatabasesBase
$this->assertEquals(false, $attribute['body']['twoWay']);
$this->assertEquals('cascade', $attribute['body']['onUpdate']);
$this->assertEquals('restrict', $attribute['body']['onDelete']);
//$this->assertEquals('libraryId', $attribute['body']['id']); //
$person1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $person['body']['$id'] . '/documents', array_merge([
'content-type' => 'application/json',
@ -350,20 +349,24 @@ trait DatabasesBase
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'queries' => ['equal("libraryId", "library1")'],
'queries' => [
'equal("libraryId", "library1")',
//'select("libraryId")'
],
]);
$this->assertEquals(1, $documents['body']['total']);
$this->assertEquals('Library 1', $documents['body']['documents'][0]['libraryId']['libraryName']);
// $documents = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $person['body']['$id'] . '/documents', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'queries' => ['equal("library.libraryName", "Library 1")'],
// ]);
//
// var_dump($documents);
$documents = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $person['body']['$id'] . '/documents', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'queries' => ['equal("library.libraryNameNotFound", "Library 1")'],
]);
$this->assertEquals(1, $documents['body']['total']); // we skip count for nested
$this->assertEquals('Library 1', $documents['body']['documents'][0]['libraryId']['libraryName']);
$response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/collections/' . $person['body']['$id'] . '/attributes/libraryId', array_merge([
'content-type' => 'application/json',
@ -371,7 +374,15 @@ trait DatabasesBase
'x-appwrite-key' => $this->getProject()['apiKey']
]));
sleep(1);
$this->assertEquals(204, $response['headers']['status-code']);
$attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/collections/{$person['body']['$id']}/attributes/libraryId", array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]));
$this->assertEquals(404, $attribute['headers']['status-code']);
die;
return [];