Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.3.x' into feat-db-update-migrations

Browse Source 
# Conflicts:
#	src/Appwrite/Migration/Version/V18.php
This commit is contained in:
Jake Barnby
2023-03-23 15:05:35 +13:00
parent c06b38773c 53dc3a9dee
commit 5689d47d41
236 changed files with 558 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Extend/Exception.php
+1
View File
@@ -135,6 +135,7 @@ class Exception extends \Exception
public const DOCUMENT_INVALID_STRUCTURE = 'document_invalid_structure';
public const DOCUMENT_MISSING_PAYLOAD = 'document_missing_payload';
public const DOCUMENT_ALREADY_EXISTS = 'document_already_exists';
public const DOCUMENT_UPDATE_CONFLICT = 'document_update_conflict';
/** Attribute */
public const ATTRIBUTE_NOT_FOUND = 'attribute_not_found';
src/Appwrite/Migration/Version/V18.php
+13 -1
View File
@@ -123,13 +123,25 @@ class V18 extends Migration
{
switch ($document->getCollection()) {
case 'projects':
/**
* Bump version number.
*/
$document->setAttribute('version', '1.3.0');
$document->setAttribute('passwordHistory', []);
/**
* Set default passwordHistory
*/
$document->setAttribute('auths', array_merge($document->getAttribute('auths', []), [
'passwordHistory' => 0,
'passwordDictionary' => false,
]));
break;
case 'users':
/**
* Default Password history
*/
$document->setAttribute('passwordHistory', []);
break;
}
return $document;
src/Appwrite/Specification/Format/OpenAPI3.php
+3
View File
@@ -170,6 +170,9 @@ class OpenAPI3 extends Format
'scope' => $route->getLabel('scope', ''),
'platforms' => $sdkPlatforms,
'packaging' => $route->getLabel('sdk.packaging', false),
'offline-model' => $route->getLabel('sdk.offline.model', ''),
'offline-key' => $route->getLabel('sdk.offline.key', ''),
'offline-response-key' => $route->getLabel('sdk.offline.response.key', '$id'),
],
];
src/Appwrite/Specification/Format/Swagger2.php
+3
View File
@@ -171,6 +171,9 @@ class Swagger2 extends Format
'scope' => $route->getLabel('scope', ''),
'platforms' => $sdkPlatforms,
'packaging' => $route->getLabel('sdk.packaging', false),
'offline-model' => $route->getLabel('sdk.offline.model', ''),
'offline-key' => $route->getLabel('sdk.offline.key', ''),
'offline-response-key' => $route->getLabel('sdk.offline.response.key', '$id'),
],
];
src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
+1 -1
View File
@@ -27,7 +27,7 @@ class IndexedQueries extends Queries
* @param Document[] $attributes
* @param Document[] $indexes
* @param Base ...$validators
* @param bool $strict
* @throws \Exception
*/
public function __construct($attributes = [], $indexes = [], Base ...$validators)
{
src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
+7 -7
View File
@@ -2,24 +2,24 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\IndexedQueries;
use Appwrite\Utopia\Database\Validator\Query\Limit;
use Appwrite\Utopia\Database\Validator\Query\Offset;
use Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Query\Cursor;
use Appwrite\Utopia\Database\Validator\Query\Filter;
use Appwrite\Utopia\Database\Validator\Query\Limit;
use Appwrite\Utopia\Database\Validator\Query\Offset;
use Appwrite\Utopia\Database\Validator\Query\Order;
use Utopia\Database\Database;
use Utopia\Database\Document;
class Documents extends IndexedQueries
class Documents extends Queries
{
/**
* Expression constructor
*
* @param Document[] $attributes
* @param Document[] $indexes
* @throws \Exception
*/
public function __construct(array $attributes, array $indexes)
public function __construct(array $attributes)
{
$attributes[] = new Document([
'key' => '$id',
@@ -45,6 +45,6 @@ class Documents extends IndexedQueries
new Order($attributes),
];
parent::__construct($attributes, $indexes, ...$validators);
parent::__construct(...$validators);
}
}