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 branch 'feat-database-indexing' into feat-quest-filters

Browse Source
This commit is contained in:
Matej Baco
2022-01-04 15:29:42 +01:00
parent 7c30844e88 4484507640
commit e2aebdd2bc
280 changed files with 813 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Migration/Version/V11.php
+10
View File
@@ -483,6 +483,16 @@ class V11 extends Migration
$document->setAttribute('$read', ['role:all']);
$document->setAttribute('$write', ['role:all']);
break;
case OldDatabase::SYSTEM_COLLECTION_CERTIFICATES:
/**
* Replace certificateId attribute.
*/
if ($document->getAttribute('certificateId') !== null) {
$document->setAttribute('$id', $document->getAttribute('certificateId'));
$document->removeAttribute('certificateId');
}
break;
case OldDatabase::SYSTEM_COLLECTION_DOMAINS:
$projectId = $this->getProjectIdFromReadPermissions($document);
src/Appwrite/Specification/Format/OpenAPI3.php
+9 -10
View File
@@ -29,7 +29,7 @@ class OpenAPI3 extends Format
*/
public function parse(): array
{
/*
/**
* Specifications (v3.0.0):
* https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md
*/
@@ -275,6 +275,7 @@ class OpenAPI3 extends Format
$node['schema']['x-example'] = false;
break;
case 'Utopia\Database\Validator\UID':
case 'Appwrite\Database\Validator\CustomId':
$node['schema']['type'] = $validator->getType();
$node['schema']['x-example'] = '['.\strtoupper(Template::fromCamelCaseToSnake($node['name'])).']';
break;
@@ -393,20 +394,18 @@ class OpenAPI3 extends Format
$output['paths'][$url][\strtolower($route->getMethod())] = $temp;
}
foreach ($this->models as $model) {
foreach ($model->getRules() as $rule) {
if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
if(\is_array($rule['type'])) {
foreach ($rule['type'] as $value) {
$usedModels[] = $value;
}
}
else {
$usedModels[] = $rule['type'];
}
if (
in_array($model->getType(), $usedModels)
&& !in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])
) {
$usedModels[] = $rule['type'];
}
}
}
foreach ($this->models as $model) {
if (!in_array($model->getType(), $usedModels) && $model->getType() !== 'error') {
continue;
src/Appwrite/Specification/Format/Swagger2.php
+6 -9
View File
@@ -263,6 +263,7 @@ class Swagger2 extends Format
$node['x-example'] = false;
break;
case 'Utopia\Database\Validator\UID':
case 'Appwrite\Database\Validator\CustomId':
$node['type'] = $validator->getType();
$node['x-example'] = '['.\strtoupper(Template::fromCamelCaseToSnake($node['name'])).']';
break;
@@ -392,15 +393,11 @@ class Swagger2 extends Format
foreach ($this->models as $model) {
foreach ($model->getRules() as $rule) {
if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
if(\is_array($rule['type'])) {
foreach ($rule['type'] as $value) {
$usedModels[] = $value;
}
}
else {
$usedModels[] = $rule['type'];
}
if (
in_array($model->getType(), $usedModels)
&& !in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])
) {
$usedModels[] = $rule['type'];
}
}
}
src/Appwrite/Utopia/Response/Model/Index.php
+1 -1
View File
@@ -20,7 +20,7 @@ class Index extends Model
'type' => self::TYPE_STRING,
'description' => 'Index type.',
'default' => '',
'example' => '',
'example' => 'primary',
])
->addRule('status', [
'type' => self::TYPE_STRING,