mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge branch '0.9.x' of https://github.com/appwrite/appwrite into feat-265-realtime
This commit is contained in:
commit
e03ba70291
1386 files changed
+31806
-1692
No files matched your search
@@ -91,12 +91,21 @@ abstract class Adapter
|
||||
/**
|
||||
* Delete Unique Key.
|
||||
*
|
||||
* @param int $key
|
||||
* @param string $key
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
abstract public function deleteUniqueKey($key);
|
||||
|
||||
/**
|
||||
* Add Unique Key.
|
||||
*
|
||||
* @param string $key
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
abstract public function addUniqueKey($key);
|
||||
|
||||
/**
|
||||
* Create Namespace.
|
||||
*
|
||||
@@ -121,10 +130,11 @@ abstract class Adapter
|
||||
* Filter data sets using chosen queries
|
||||
*
|
||||
* @param array $options
|
||||
* @param array $filterTypes
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
abstract public function getCollection(array $options);
|
||||
abstract public function getCollection(array $options, array $filterTypes = []);
|
||||
|
||||
/**
|
||||
* @param array $options
|
||||
|
||||
@@ -366,7 +366,7 @@ class MySQL extends Adapter
|
||||
/**
|
||||
* Delete Unique Key.
|
||||
*
|
||||
* @param int $key
|
||||
* @param string $key
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
@@ -383,6 +383,30 @@ class MySQL extends Adapter
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Add Unique Key.
|
||||
*
|
||||
* @param string $key
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function addUniqueKey($key)
|
||||
{
|
||||
$st = $this->getPDO()->prepare('INSERT INTO `'.$this->getNamespace().'.database.unique`
|
||||
SET `key` = :key;
|
||||
');
|
||||
|
||||
$st->bindValue(':key', $key, PDO::PARAM_STR);
|
||||
|
||||
if (!$st->execute()) {
|
||||
throw new Duplicate('Duplicated Property: '.$key);
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create Relation.
|
||||
*
|
||||
@@ -493,12 +517,13 @@ class MySQL extends Adapter
|
||||
* Get Collection.
|
||||
*
|
||||
* @param array $options
|
||||
* @param array $filterTypes
|
||||
*
|
||||
* @throws Exception
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getCollection(array $options)
|
||||
public function getCollection(array $options, array $filterTypes = [])
|
||||
{
|
||||
$start = \microtime(true);
|
||||
$orderCastMap = [
|
||||
@@ -544,8 +569,14 @@ class MySQL extends Adapter
|
||||
|
||||
//$path = implode('.', $path);
|
||||
|
||||
if(array_key_exists($key, $filterTypes) && $filterTypes[$key] === 'numeric') {
|
||||
$value = (float) $value;
|
||||
} else {
|
||||
$value = $this->getPDO()->quote($value, PDO::PARAM_STR);
|
||||
}
|
||||
|
||||
$key = $this->getPDO()->quote($key, PDO::PARAM_STR);
|
||||
$value = $this->getPDO()->quote($value, PDO::PARAM_STR);
|
||||
|
||||
//$path = $this->getPDO()->quote($path, PDO::PARAM_STR);
|
||||
$options['offset'] = (int) $options['offset'];
|
||||
$options['limit'] = (int) $options['limit'];
|
||||
|
||||
@@ -168,6 +168,22 @@ class Redis extends Adapter
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add Unique Key.
|
||||
*
|
||||
* @param $key
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function addUniqueKey($key)
|
||||
{
|
||||
$data = $this->adapter->addUniqueKey($key);
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create Namespace.
|
||||
*
|
||||
@@ -194,14 +210,15 @@ class Redis extends Adapter
|
||||
|
||||
/**
|
||||
* @param array $options
|
||||
* @param array $filterTypes
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getCollection(array $options)
|
||||
public function getCollection(array $options, array $filterTypes = [])
|
||||
{
|
||||
$data = $this->adapter->getCollection($options);
|
||||
$data = $this->adapter->getCollection($options, $filterTypes);
|
||||
$keys = [];
|
||||
|
||||
foreach ($data as $node) {
|
||||
|
||||
@@ -145,10 +145,11 @@ class Database
|
||||
|
||||
/**
|
||||
* @param array $options
|
||||
* @param array $filterTypes
|
||||
*
|
||||
* @return Document[]
|
||||
*/
|
||||
public function getCollection(array $options)
|
||||
public function getCollection(array $options, array $filterTypes = [])
|
||||
{
|
||||
$options = \array_merge([
|
||||
'offset' => 0,
|
||||
@@ -161,7 +162,7 @@ class Database
|
||||
'filters' => [],
|
||||
], $options);
|
||||
|
||||
$results = $this->adapter->getCollection($options);
|
||||
$results = $this->adapter->getCollection($options, $filterTypes);
|
||||
|
||||
foreach ($results as &$node) {
|
||||
$node = $this->decode(new Document($node));
|
||||
@@ -370,6 +371,18 @@ class Database
|
||||
return new Document($this->adapter->deleteUniqueKey($key));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $key
|
||||
*
|
||||
* @return Document|false
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public function addUniqueKey($key)
|
||||
{
|
||||
return new Document($this->adapter->addUniqueKey($key));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
|
||||
@@ -31,6 +31,16 @@ abstract class Migration
|
||||
*/
|
||||
protected $projectDB;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
public static array $versions = [
|
||||
'0.6.0' => 'V05',
|
||||
'0.7.0' => 'V06',
|
||||
'0.8.0' => 'V07',
|
||||
'0.9.0' => 'V08',
|
||||
];
|
||||
|
||||
/**
|
||||
* Migration constructor.
|
||||
*
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Appwrite\Migration\Version;
|
||||
|
||||
use Utopia\CLI\Console;
|
||||
use Appwrite\Migration\Migration;
|
||||
|
||||
class V04 extends Migration
|
||||
{
|
||||
public function execute(): void
|
||||
{
|
||||
Console::log('I got nothing to do.');
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@ class V07 extends Migration
|
||||
{
|
||||
public function execute(): void
|
||||
{
|
||||
$db = $this->db;
|
||||
$project = $this->project;
|
||||
Console::log('Migrating project: ' . $project->getAttribute('name') . ' (' . $project->getId() . ')');
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
<?php
|
||||
|
||||
namespace Appwrite\Migration\Version;
|
||||
|
||||
use Appwrite\Migration\Migration;
|
||||
use Utopia\Config\Config;
|
||||
use Utopia\CLI\Console;
|
||||
use Appwrite\Database\Database;
|
||||
use Appwrite\Database\Document;
|
||||
|
||||
class V08 extends Migration
|
||||
{
|
||||
public function execute(): void
|
||||
{
|
||||
$project = $this->project;
|
||||
Console::log('Migrating project: ' . $project->getAttribute('name') . ' (' . $project->getId() . ')');
|
||||
|
||||
$this->forEachDocument([$this, 'fixDocument']);
|
||||
}
|
||||
|
||||
protected function fixDocument(Document $document)
|
||||
{
|
||||
switch ($document->getAttribute('$collection')) {
|
||||
/**
|
||||
* Rename env attribute to runtime.
|
||||
*/
|
||||
case Database::SYSTEM_COLLECTION_FUNCTIONS:
|
||||
if ($document->isSet('env')) {
|
||||
$document
|
||||
->setAttribute('runtime', $document->getAttribute('env', $document->getAttribute('env', '')))
|
||||
->removeAttribute('env');
|
||||
}
|
||||
|
||||
break;
|
||||
/**
|
||||
* Add version reference to database.
|
||||
*/
|
||||
case Database::SYSTEM_COLLECTION_PROJECTS:
|
||||
$document->setAttribute('version', '0.9.0');
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
foreach ($document as &$attr) {
|
||||
if ($attr instanceof Document) {
|
||||
$attr = $this->fixDocument($attr);
|
||||
}
|
||||
|
||||
if (\is_array($attr)) {
|
||||
foreach ($attr as &$child) {
|
||||
if ($child instanceof Document) {
|
||||
$child = $this->fixDocument($child);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $document;
|
||||
}
|
||||
}
|
||||
@@ -12,8 +12,6 @@ use Exception;
|
||||
use Utopia\Config\Config;
|
||||
use Utopia\Locale\Locale as Locale;
|
||||
|
||||
use function PHPSTORM_META\map;
|
||||
|
||||
class V06 extends Filter {
|
||||
|
||||
// Convert 0.7 Data format to 0.6 format
|
||||
|
||||
@@ -2,18 +2,9 @@
|
||||
|
||||
namespace Appwrite\Utopia\Response\Filters;
|
||||
|
||||
use Appwrite\Auth\Auth;
|
||||
use Appwrite\Database\Database;
|
||||
use Appwrite\Database\Validator\Authorization;
|
||||
use Appwrite\OpenSSL\OpenSSL;
|
||||
use Appwrite\Utopia\Response;
|
||||
use Appwrite\Utopia\Response\Filter;
|
||||
use Exception;
|
||||
use Utopia\Config\Config;
|
||||
use Utopia\Locale\Locale as Locale;
|
||||
|
||||
use function PHPSTORM_META\map;
|
||||
|
||||
class V07 extends Filter {
|
||||
|
||||
// Convert 0.8 Data format to 0.7 format
|
||||
@@ -31,8 +22,6 @@ class V07 extends Filter {
|
||||
case Response::MODEL_COLLECTION:
|
||||
case Response::MODEL_FILE_LIST:
|
||||
case Response::MODEL_FILE:
|
||||
case Response::MODEL_FUNCTION_LIST:
|
||||
case Response::MODEL_FUNCTION:
|
||||
case Response::MODEL_TAG_LIST:
|
||||
case Response::MODEL_TAG:
|
||||
case Response::MODEL_EXECUTION_LIST:
|
||||
@@ -44,14 +33,34 @@ class V07 extends Filter {
|
||||
case Response::MODEL_SESSION_LIST: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
|
||||
case Response::MODEL_SESSION: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
|
||||
case Response::MODEL_JWT:
|
||||
case Response::MODEL_LOG:
|
||||
case Response::MODEL_LOG_LIST:
|
||||
case Response::MODEL_TOKEN:
|
||||
case Response::MODEL_LOCALE:
|
||||
case Response::MODEL_COUNTRY:
|
||||
case Response::MODEL_COUNTRY_LIST:
|
||||
case Response::MODEL_PHONE:
|
||||
case Response::MODEL_PHONE_LIST:
|
||||
case Response::MODEL_CONTINENT:
|
||||
case Response::MODEL_CONTINENT_LIST:
|
||||
case Response::MODEL_CURRENCY:
|
||||
case Response::MODEL_CURRENCY_LIST:
|
||||
case Response::MODEL_LANGUAGE:
|
||||
case Response::MODEL_LANGUAGE_LIST:
|
||||
case Response::MODEL_PROJECT:
|
||||
case Response::MODEL_PROJECT_LIST:
|
||||
case Response::MODEL_PLATFORM:
|
||||
case Response::MODEL_PLATFORM_LIST:
|
||||
case Response::MODEL_DOMAIN:
|
||||
case Response::MODEL_DOMAIN_LIST:
|
||||
case Response::MODEL_KEY:
|
||||
case Response::MODEL_KEY_LIST:
|
||||
case Response::MODEL_PERMISSIONS:
|
||||
case Response::MODEL_RULE:
|
||||
case Response::MODEL_TASK:
|
||||
case Response::MODEL_WEBHOOK:
|
||||
case Response::MODEL_WEBHOOK_LIST:
|
||||
case Response::MODEL_MOCK:
|
||||
case Response::MODEL_ANY:
|
||||
case Response::MODEL_PREFERENCES: /** ANY was replaced by PREFERENCES in 0.8.x but this is backward compatible with 0.7.x */
|
||||
case Response::MODEL_NONE:
|
||||
@@ -59,6 +68,12 @@ class V07 extends Filter {
|
||||
case Response::MODEL_ERROR_DEV:
|
||||
$parsedResponse = $content;
|
||||
break;
|
||||
case Response::MODEL_FUNCTION_LIST: /** Function property env was renamed to runtime in 0.9.x */
|
||||
$parsedResponse = $this->parseFunctionList($content);
|
||||
break;
|
||||
case Response::MODEL_FUNCTION:
|
||||
$parsedResponse = $this->parseFunctionList($content); /** Function property env was renamed to runtime in 0.9.x */
|
||||
break;
|
||||
default:
|
||||
throw new Exception('Received invalid model : '.$model);
|
||||
}
|
||||
@@ -66,4 +81,20 @@ class V07 extends Filter {
|
||||
return $parsedResponse;
|
||||
}
|
||||
|
||||
protected function parseFunction(array $content) {
|
||||
$content['env'] = $content['runtime'];
|
||||
unset($content['runtime']);
|
||||
return $content;
|
||||
}
|
||||
|
||||
protected function parseFunctionList(array $content){
|
||||
$functions = $content['functions'];
|
||||
$parsedResponse = [];
|
||||
foreach($functions as $function) {
|
||||
$parsedResponse[] = $this->parseFunction($function);
|
||||
}
|
||||
$content['functions'] = $parsedResponse;
|
||||
return $content;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
<?php
|
||||
|
||||
namespace Appwrite\Utopia\Response\Filters;
|
||||
|
||||
use Appwrite\Utopia\Response;
|
||||
use Appwrite\Utopia\Response\Filter;
|
||||
use Exception;
|
||||
|
||||
|
||||
class V08 extends Filter {
|
||||
|
||||
// Convert 0.9 Data format to 0.8 format
|
||||
public function parse(array $content, string $model): array {
|
||||
|
||||
$parsedResponse = [];
|
||||
|
||||
switch($model) {
|
||||
|
||||
case Response::MODEL_DOCUMENT_LIST:
|
||||
case Response::MODEL_DOCUMENT:
|
||||
case Response::MODEL_USER_LIST:
|
||||
case Response::MODEL_USER:
|
||||
case Response::MODEL_COLLECTION_LIST:
|
||||
case Response::MODEL_COLLECTION:
|
||||
case Response::MODEL_FILE_LIST:
|
||||
case Response::MODEL_FILE:
|
||||
case Response::MODEL_TAG_LIST:
|
||||
case Response::MODEL_TAG:
|
||||
case Response::MODEL_EXECUTION_LIST:
|
||||
case Response::MODEL_EXECUTION:
|
||||
case Response::MODEL_TEAM_LIST:
|
||||
case Response::MODEL_TEAM:
|
||||
case Response::MODEL_MEMBERSHIP_LIST:
|
||||
case Response::MODEL_MEMBERSHIP:
|
||||
case Response::MODEL_SESSION_LIST:
|
||||
case Response::MODEL_SESSION:
|
||||
case Response::MODEL_JWT:
|
||||
case Response::MODEL_LOG:
|
||||
case Response::MODEL_LOG_LIST:
|
||||
case Response::MODEL_TOKEN:
|
||||
case Response::MODEL_LOCALE:
|
||||
case Response::MODEL_COUNTRY:
|
||||
case Response::MODEL_COUNTRY_LIST:
|
||||
case Response::MODEL_PHONE:
|
||||
case Response::MODEL_PHONE_LIST:
|
||||
case Response::MODEL_CONTINENT:
|
||||
case Response::MODEL_CONTINENT_LIST:
|
||||
case Response::MODEL_CURRENCY:
|
||||
case Response::MODEL_CURRENCY_LIST:
|
||||
case Response::MODEL_LANGUAGE:
|
||||
case Response::MODEL_LANGUAGE_LIST:
|
||||
case Response::MODEL_PROJECT:
|
||||
case Response::MODEL_PROJECT_LIST:
|
||||
case Response::MODEL_PLATFORM:
|
||||
case Response::MODEL_PLATFORM_LIST:
|
||||
case Response::MODEL_DOMAIN:
|
||||
case Response::MODEL_DOMAIN_LIST:
|
||||
case Response::MODEL_KEY:
|
||||
case Response::MODEL_KEY_LIST:
|
||||
case Response::MODEL_PERMISSIONS:
|
||||
case Response::MODEL_RULE:
|
||||
case Response::MODEL_TASK:
|
||||
case Response::MODEL_WEBHOOK:
|
||||
case Response::MODEL_WEBHOOK_LIST:
|
||||
case Response::MODEL_MOCK:
|
||||
case Response::MODEL_ANY:
|
||||
case Response::MODEL_PREFERENCES:
|
||||
case Response::MODEL_NONE:
|
||||
case Response::MODEL_ERROR:
|
||||
case Response::MODEL_ERROR_DEV:
|
||||
$parsedResponse = $content;
|
||||
break;
|
||||
case Response::MODEL_FUNCTION_LIST: /** Function property env was renamed to runtime in 0.9.x */
|
||||
$parsedResponse = $this->parseFunctionList($content);
|
||||
break;
|
||||
case Response::MODEL_FUNCTION: /** Function property env was renamed to runtime in 0.9.x */
|
||||
$parsedResponse = $this->parseFunctionList($content);
|
||||
break;
|
||||
default:
|
||||
throw new Exception('Received invalid model : '.$model);
|
||||
}
|
||||
|
||||
return $parsedResponse;
|
||||
}
|
||||
|
||||
protected function parseFunction(array $content) {
|
||||
$content['env'] = $content['runtime'];
|
||||
unset($content['runtime']);
|
||||
return $content;
|
||||
}
|
||||
|
||||
protected function parseFunctionList(array $content){
|
||||
$functions = $content['functions'];
|
||||
$parsedResponse = [];
|
||||
foreach($functions as $function) {
|
||||
$parsedResponse[] = $this->parseFunction($function);
|
||||
}
|
||||
$content['functions'] = $parsedResponse;
|
||||
return $content;
|
||||
}
|
||||
}
|
||||
@@ -55,13 +55,13 @@ class Execution extends Model
|
||||
])
|
||||
->addRule('stdout', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'The script stdout output string.',
|
||||
'description' => 'The script stdout output string. Logs the last 4,000 characters of the execution stdout output.',
|
||||
'default' => '',
|
||||
'example' => '',
|
||||
])
|
||||
->addRule('stderr', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'The script stderr output string.',
|
||||
'description' => 'The script stderr output string. Logs the last 4,000 characters of the execution stderr output',
|
||||
'default' => '',
|
||||
'example' => '',
|
||||
])
|
||||
|
||||
Reference in new issue
Block a user