Namespace Changes
This commit is contained in:
parent
e631453e3b
commit
0460b59cdc
7 changed files with 13 additions and 108 deletions
|
@ -46,10 +46,8 @@ use Appwrite\Event\Event;
|
||||||
use Utopia\Database\Validator\Queries;
|
use Utopia\Database\Validator\Queries;
|
||||||
use Appwrite\Utopia\Database\Validator\Queries\Collections;
|
use Appwrite\Utopia\Database\Validator\Queries\Collections;
|
||||||
use Appwrite\Utopia\Database\Validator\Queries\Databases;
|
use Appwrite\Utopia\Database\Validator\Queries\Databases;
|
||||||
//use Appwrite\Utopia\Database\Validator\Queries\Document as DocumentValidator;
|
use Utopia\Database\Validator\Queries\Documents as DocumentsValidator;
|
||||||
//use Appwrite\Utopia\Database\Validator\Queries\Documents;
|
use Utopia\Database\Validator\Queries\Document as DocumentValidator;
|
||||||
use Utopia\Database\Validator\Documents;
|
|
||||||
use Utopia\Database\Validator\DocumentValidator;
|
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use MaxMind\Db\Reader;
|
use MaxMind\Db\Reader;
|
||||||
use Utopia\Validator\Nullable;
|
use Utopia\Validator\Nullable;
|
||||||
|
@ -2875,7 +2873,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate queries
|
// Validate queries
|
||||||
$queriesValidator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
|
$queriesValidator = new DocumentsValidator($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
|
||||||
$validQueries = $queriesValidator->isValid($queries);
|
$validQueries = $queriesValidator->isValid($queries);
|
||||||
if (!$validQueries) {
|
if (!$validQueries) {
|
||||||
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $queriesValidator->getDescription());
|
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $queriesValidator->getDescription());
|
||||||
|
|
8
composer.lock
generated
8
composer.lock
generated
|
@ -2113,12 +2113,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/database.git",
|
"url": "https://github.com/utopia-php/database.git",
|
||||||
"reference": "94bca644f3ff418e6742e89fcf571c2c342adcd6"
|
"reference": "e56f580f304c70a55f3d75c6d3ab554c7e687789"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/database/zipball/94bca644f3ff418e6742e89fcf571c2c342adcd6",
|
"url": "https://api.github.com/repos/utopia-php/database/zipball/e56f580f304c70a55f3d75c6d3ab554c7e687789",
|
||||||
"reference": "94bca644f3ff418e6742e89fcf571c2c342adcd6",
|
"reference": "e56f580f304c70a55f3d75c6d3ab554c7e687789",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2163,7 +2163,7 @@
|
||||||
"issues": "https://github.com/utopia-php/database/issues",
|
"issues": "https://github.com/utopia-php/database/issues",
|
||||||
"source": "https://github.com/utopia-php/database/tree/appwrite-validators"
|
"source": "https://github.com/utopia-php/database/tree/appwrite-validators"
|
||||||
},
|
},
|
||||||
"time": "2023-04-27T06:57:58+00:00"
|
"time": "2023-04-27T08:18:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/domains",
|
"name": "utopia-php/domains",
|
||||||
|
|
|
@ -254,14 +254,14 @@ class Mapper
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Documents':
|
case 'Utopia\Database\Validator\Queries\Documents':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Memberships':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Memberships':
|
||||||
case 'Utopia\Database\Validator\Permissions':
|
case 'Utopia\Database\Validator\Permissions':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Projects':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Projects':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries':
|
case 'Utopia\Database\Validator\Queries':
|
||||||
case 'Utopia\Database\Validator\Roles':
|
case 'Utopia\Database\Validator\Roles':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
||||||
|
|
|
@ -345,7 +345,7 @@ class OpenAPI3 extends Format
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Documents':
|
case 'Utopia\Database\Validator\Queries\Documents':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
||||||
|
@ -354,7 +354,7 @@ class OpenAPI3 extends Format
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries':
|
case 'Utopia\Database\Validator\Queries':
|
||||||
$node['schema']['type'] = 'array';
|
$node['schema']['type'] = 'array';
|
||||||
$node['schema']['items'] = [
|
$node['schema']['items'] = [
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
|
|
|
@ -344,7 +344,7 @@ class Swagger2 extends Format
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Documents':
|
case 'Utopia\Database\Validator\Queries\Documents':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Files':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
|
||||||
|
@ -353,7 +353,7 @@ class Swagger2 extends Format
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Users':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
|
case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
|
||||||
case 'Appwrite\Utopia\Database\Validator\Queries':
|
case 'Utopia\Database\Validator\Queries':
|
||||||
$node['type'] = 'array';
|
$node['type'] = 'array';
|
||||||
$node['collectionFormat'] = 'multi';
|
$node['collectionFormat'] = 'multi';
|
||||||
$node['items'] = [
|
$node['items'] = [
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Appwrite\Utopia\Database\Validator\Queries;
|
|
||||||
|
|
||||||
use Utopia\Database\Validator\Queries;
|
|
||||||
use Utopia\Database\Validator\Query\Select;
|
|
||||||
use Utopia\Database\Database;
|
|
||||||
|
|
||||||
class Document extends Queries
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Expression constructor
|
|
||||||
*
|
|
||||||
* @param array $attributes
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public function __construct(array $attributes)
|
|
||||||
{
|
|
||||||
$attributes[] = new \Utopia\Database\Document([
|
|
||||||
'key' => '$id',
|
|
||||||
'type' => Database::VAR_STRING,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
$attributes[] = new \Utopia\Database\Document([
|
|
||||||
'key' => '$createdAt',
|
|
||||||
'type' => Database::VAR_DATETIME,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
$attributes[] = new \Utopia\Database\Document([
|
|
||||||
'key' => '$updatedAt',
|
|
||||||
'type' => Database::VAR_DATETIME,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$validators = [
|
|
||||||
new Select($attributes),
|
|
||||||
];
|
|
||||||
|
|
||||||
parent::__construct(...$validators);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Appwrite\Utopia\Database\Validator\Queries;
|
|
||||||
|
|
||||||
use Utopia\Database\Validator\IndexedQueries;
|
|
||||||
use Utopia\Database\Validator\Query\Cursor;
|
|
||||||
use Utopia\Database\Validator\Query\Filter;
|
|
||||||
use Utopia\Database\Validator\Query\Limit;
|
|
||||||
use Utopia\Database\Validator\Query\Offset;
|
|
||||||
use Utopia\Database\Validator\Query\Order;
|
|
||||||
use Utopia\Database\Validator\Query\Select;
|
|
||||||
use Utopia\Database\Database;
|
|
||||||
use Utopia\Database\Document;
|
|
||||||
|
|
||||||
class Documents extends IndexedQueries
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Expression constructor
|
|
||||||
*
|
|
||||||
* @param Document[] $attributes
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public function __construct(array $attributes, array $indexes)
|
|
||||||
{
|
|
||||||
$attributes[] = new Document([
|
|
||||||
'key' => '$id',
|
|
||||||
'type' => Database::VAR_STRING,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
$attributes[] = new Document([
|
|
||||||
'key' => '$createdAt',
|
|
||||||
'type' => Database::VAR_DATETIME,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
$attributes[] = new Document([
|
|
||||||
'key' => '$updatedAt',
|
|
||||||
'type' => Database::VAR_DATETIME,
|
|
||||||
'array' => false,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$validators = [
|
|
||||||
new Limit(),
|
|
||||||
new Offset(),
|
|
||||||
new Cursor(),
|
|
||||||
new Filter($attributes),
|
|
||||||
new Order($attributes),
|
|
||||||
new Select($attributes),
|
|
||||||
];
|
|
||||||
|
|
||||||
parent::__construct($attributes, $indexes, ...$validators);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue