Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert to utopia database instead of extension

Browse source
This commit is contained in:
Jake Barnby 2024-07-02 19:10:02 +12:00
parent 10adfc5124
commit ec2eb2bfa3
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
49 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/cli.php
View file

@ -7,12 +7,12 @@ use Appwrite\Event\Certificate;
use Appwrite\Event\Delete; use Appwrite\Event\Delete;
use Appwrite\Event\Func; use Appwrite\Event\Func;
use Appwrite\Platform\Appwrite; use Appwrite\Platform\Appwrite;
use Appwrite\Utopia\Database\Database;
use Utopia\Cache\Adapter\Sharding; use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\CLI; use Utopia\CLI\CLI;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization; use Utopia\Database\Validator\Authorization;
use Utopia\DSN\DSN; use Utopia\DSN\DSN;

2
app/config/collections.php
View file

@ -1,8 +1,8 @@
<?php <?php
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Utopia\Database\Database;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
$providers = Config::getParam('oAuthProviders', []); $providers = Config::getParam('oAuthProviders', []);

2
app/controllers/api/account.php
View file

@ -23,7 +23,6 @@ use Appwrite\Network\Validator\Email;
use Appwrite\OpenSSL\OpenSSL; use Appwrite\OpenSSL\OpenSSL;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\URL\URL as URLParser; use Appwrite\URL\URL as URLParser;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Identities; use Appwrite\Utopia\Database\Validator\Queries\Identities;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
@ -32,6 +31,7 @@ use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\Audit\Audit as EventAudit; use Utopia\Audit\Audit as EventAudit;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate; use Utopia\Database\Exception\Duplicate;

2
app/controllers/api/avatars.php
View file

@ -2,12 +2,12 @@
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\URL\URL as URLParse; use Appwrite\URL\URL as URLParse;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use chillerlan\QRCode\QRCode; use chillerlan\QRCode\QRCode;
use chillerlan\QRCode\QROptions; use chillerlan\QRCode\QROptions;
use Utopia\App; use Utopia\App;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization; use Utopia\Database\Validator\Authorization;

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

@ -7,7 +7,6 @@ use Appwrite\Event\Delete;
use Appwrite\Event\Event; use Appwrite\Event\Event;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\Email;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Attributes; use Appwrite\Utopia\Database\Validator\Queries\Attributes;
use Appwrite\Utopia\Database\Validator\Queries\Collections; use Appwrite\Utopia\Database\Validator\Queries\Collections;
@ -20,6 +19,7 @@ use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization as AuthorizationException; use Utopia\Database\Exception\Authorization as AuthorizationException;
use Utopia\Database\Exception\Conflict as ConflictException; use Utopia\Database\Exception\Conflict as ConflictException;

2
app/controllers/api/functions.php
View file

@ -12,7 +12,6 @@ use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException; use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Task\Validator\Cron; use Appwrite\Task\Validator\Cron;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Deployments; use Appwrite\Utopia\Database\Validator\Queries\Deployments;
use Appwrite\Utopia\Database\Validator\Queries\Executions; use Appwrite\Utopia\Database\Validator\Queries\Executions;
@ -24,6 +23,7 @@ use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate as DuplicateException; use Utopia\Database\Exception\Duplicate as DuplicateException;

2
app/controllers/api/messaging.php
View file

@ -11,7 +11,6 @@ use Appwrite\Messaging\Status as MessageStatus;
use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\Email;
use Appwrite\Permission; use Appwrite\Permission;
use Appwrite\Role; use Appwrite\Role;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CompoundUID; use Appwrite\Utopia\Database\Validator\CompoundUID;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Messages; use Appwrite\Utopia\Database\Validator\Queries\Messages;
@ -23,6 +22,7 @@ use Appwrite\Utopia\Response;
use MaxMind\Db\Reader; use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate as DuplicateException; use Utopia\Database\Exception\Duplicate as DuplicateException;

2
app/controllers/api/migrations.php
View file

@ -6,11 +6,11 @@ use Appwrite\Event\Migration;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Permission; use Appwrite\Permission;
use Appwrite\Role; use Appwrite\Role;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\Queries\Migrations; use Appwrite\Utopia\Database\Validator\Queries\Migrations;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Query as QueryException; use Utopia\Database\Exception\Query as QueryException;

2
app/controllers/api/project.php
View file

@ -1,9 +1,9 @@
<?php <?php
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate as DuplicateException; use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
app/controllers/api/projects.php
View file

@ -9,7 +9,6 @@ use Appwrite\Hooks\Hooks;
use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\Email;
use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\Origin;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\ProjectId; use Appwrite\Utopia\Database\Validator\ProjectId;
use Appwrite\Utopia\Database\Validator\Queries\Projects; use Appwrite\Utopia\Database\Validator\Queries\Projects;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
@ -20,6 +19,7 @@ use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate; use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Exception\Query as QueryException; use Utopia\Database\Exception\Query as QueryException;

2
app/controllers/api/proxy.php
View file

@ -5,10 +5,10 @@ use Appwrite\Event\Delete;
use Appwrite\Event\Event; use Appwrite\Event\Event;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Network\Validator\CNAME; use Appwrite\Network\Validator\CNAME;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\Queries\Rules; use Appwrite\Utopia\Database\Validator\Queries\Rules;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Query as QueryException; use Utopia\Database\Exception\Query as QueryException;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
app/controllers/api/storage.php
View file

@ -8,13 +8,13 @@ use Appwrite\Event\Delete;
use Appwrite\Event\Event; use Appwrite\Event\Event;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\OpenSSL\OpenSSL; use Appwrite\OpenSSL\OpenSSL;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Buckets; use Appwrite\Utopia\Database\Validator\Queries\Buckets;
use Appwrite\Utopia\Database\Validator\Queries\Files; use Appwrite\Utopia\Database\Validator\Queries\Files;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate; use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Exception\Query as QueryException; use Utopia\Database\Exception\Query as QueryException;

2
app/controllers/api/teams.php
View file

@ -11,7 +11,6 @@ use Appwrite\Event\Messaging;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\Email;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Memberships; use Appwrite\Utopia\Database\Validator\Queries\Memberships;
use Appwrite\Utopia\Database\Validator\Queries\Teams; use Appwrite\Utopia\Database\Validator\Queries\Teams;
@ -21,6 +20,7 @@ use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization as AuthorizationException; use Utopia\Database\Exception\Authorization as AuthorizationException;

2
app/controllers/api/users.php
View file

@ -14,7 +14,6 @@ use Appwrite\Event\Event;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Hooks\Hooks; use Appwrite\Hooks\Hooks;
use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\Email;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Database\Validator\Queries\Identities; use Appwrite\Utopia\Database\Validator\Queries\Identities;
use Appwrite\Utopia\Database\Validator\Queries\Targets; use Appwrite\Utopia\Database\Validator\Queries\Targets;
@ -25,6 +24,7 @@ use MaxMind\Db\Reader;
use Utopia\App; use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate; use Utopia\Database\Exception\Duplicate;

2
app/controllers/api/vcs.php
View file

@ -4,7 +4,6 @@ use Appwrite\Auth\OAuth2\Github as OAuth2Github;
use Appwrite\Event\Build; use Appwrite\Event\Build;
use Appwrite\Event\Delete; use Appwrite\Event\Delete;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Database\Validator\Queries\Installations; use Appwrite\Utopia\Database\Validator\Queries\Installations;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
@ -12,6 +11,7 @@ use Appwrite\Vcs\Comment;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Query as QueryException; use Utopia\Database\Exception\Query as QueryException;

2
app/controllers/general.php
View file

@ -8,7 +8,6 @@ use Appwrite\Event\Event;
use Appwrite\Event\Usage; use Appwrite\Event\Usage;
use Appwrite\Extend\Exception as AppwriteException; use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\Origin;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Request\Filters\V16 as RequestV16; use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
use Appwrite\Utopia\Request\Filters\V17 as RequestV17; use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
@ -22,6 +21,7 @@ use Swoole\Http\Request as SwooleRequest;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Query; use Utopia\Database\Query;

2
app/controllers/mock.php
View file

@ -3,10 +3,10 @@
global $utopia, $request, $response; global $utopia, $request, $response;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;

2
app/controllers/shared/api.php
View file

@ -13,7 +13,6 @@ use Appwrite\Event\Usage;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException; use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\Abuse\Abuse; use Utopia\Abuse\Abuse;
@ -22,6 +21,7 @@ use Utopia\App;
use Utopia\Cache\Adapter\Filesystem; use Utopia\Cache\Adapter\Filesystem;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\Role; use Utopia\Database\Helpers\Role;

4
app/http.php
View file

@ -2,7 +2,6 @@
require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php';
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Swoole\Constant; use Swoole\Constant;
@ -15,6 +14,7 @@ use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;
@ -78,7 +78,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
try { try {
$attempts++; $attempts++;
$dbForConsole = $app->getResource('dbForConsole'); $dbForConsole = $app->getResource('dbForConsole');
/** @var Appwrite\Utopia\Database\Database $dbForConsole */ /** @var Utopia\Database\Database $dbForConsole */
break; // leave the do-while if successful break; // leave the do-while if successful
} catch (\Throwable $e) { } catch (\Throwable $e) {
Console::warning("Database not ready. Retrying connection ({$attempts})..."); Console::warning("Database not ready. Retrying connection ({$attempts})...");

8
app/init.php
View file

@ -40,7 +40,6 @@ use Appwrite\Network\Validator\Email;
use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\Origin;
use Appwrite\OpenSSL\OpenSSL; use Appwrite\OpenSSL\OpenSSL;
use Appwrite\URL\URL as AppwriteURL; use Appwrite\URL\URL as AppwriteURL;
use Appwrite\Utopia\Database\Database;
use MaxMind\Db\Reader; use MaxMind\Db\Reader;
use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Database\PDOProxy; use Swoole\Database\PDOProxy;
@ -53,6 +52,7 @@ use Utopia\Config\Config;
use Utopia\Database\Adapter\MariaDB; use Utopia\Database\Adapter\MariaDB;
use Utopia\Database\Adapter\MySQL; use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Adapter\SQL; use Utopia\Database\Adapter\SQL;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Query; use Utopia\Database\Query;
@ -1124,8 +1124,8 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
/** @var Appwrite\Utopia\Request $request */ /** @var Appwrite\Utopia\Request $request */
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Utopia\Database\Document $project */ /** @var Utopia\Database\Document $project */
/** @var Appwrite\Utopia\Database\Database $dbForProject */ /** @var Utopia\Database\Database $dbForProject */
/** @var Appwrite\Utopia\Database\Database $dbForConsole */ /** @var Utopia\Database\Database $dbForConsole */
/** @var string $mode */ /** @var string $mode */
Authorization::setDefaultStatus(true); Authorization::setDefaultStatus(true);
@ -1229,7 +1229,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
App::setResource('project', function ($dbForConsole, $request, $console) { App::setResource('project', function ($dbForConsole, $request, $console) {
/** @var Appwrite\Utopia\Request $request */ /** @var Appwrite\Utopia\Request $request */
/** @var Appwrite\Utopia\Database\Database $dbForConsole */ /** @var Utopia\Database\Database $dbForConsole */
/** @var Utopia\Database\Document $console */ /** @var Utopia\Database\Document $console */
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', '')); $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));

2
app/realtime.php
View file

@ -5,7 +5,6 @@ use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException; use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\Origin;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Request; use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Swoole\Http\Request as SwooleRequest; use Swoole\Http\Request as SwooleRequest;
@ -20,6 +19,7 @@ use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
app/worker.php
View file

@ -15,13 +15,13 @@ use Appwrite\Event\Migration;
use Appwrite\Event\Usage; use Appwrite\Event\Usage;
use Appwrite\Event\UsageDump; use Appwrite\Event\UsageDump;
use Appwrite\Platform\Appwrite; use Appwrite\Platform\Appwrite;
use Appwrite\Utopia\Database\Database;
use Swoole\Runtime; use Swoole\Runtime;
use Utopia\App; use Utopia\App;
use Utopia\Cache\Adapter\Sharding; use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization; use Utopia\Database\Validator\Authorization;

6
src/Appwrite/Migration/Migration.php
View file

@ -2,11 +2,11 @@
namespace Appwrite\Migration; namespace Appwrite\Migration;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Swoole\Runtime; use Swoole\Runtime;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Query; use Utopia\Database\Query;
@ -293,7 +293,7 @@ abstract class Migration
/** /**
* Creates attribute from collections.php * Creates attribute from collections.php
* *
* @param \Appwrite\Utopia\Database\Database $database * @param \Utopia\Database\Database $database
* @param string $collectionId * @param string $collectionId
* @param string $attributeId * @param string $attributeId
* @return void * @return void
@ -350,7 +350,7 @@ abstract class Migration
/** /**
* Creates index from collections.php * Creates index from collections.php
* *
* @param \Appwrite\Utopia\Database\Database $database * @param \Utopia\Database\Database $database
* @param string $collectionId * @param string $collectionId
* @param string $indexId * @param string $indexId
* @param string|null $from * @param string|null $from

2
src/Appwrite/Migration/Version/V15.php
View file

@ -4,9 +4,9 @@ namespace Appwrite\Migration\Version;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\OpenSSL\OpenSSL; use Appwrite\OpenSSL\OpenSSL;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;

2
src/Appwrite/Migration/Version/V16.php
View file

@ -4,9 +4,9 @@ namespace Appwrite\Migration\Version;
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
class V16 extends Migration class V16 extends Migration

2
src/Appwrite/Migration/Version/V17.php
View file

@ -4,8 +4,8 @@ namespace Appwrite\Migration\Version;
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
class V17 extends Migration class V17 extends Migration

2
src/Appwrite/Migration/Version/V18.php
View file

@ -3,8 +3,8 @@
namespace Appwrite\Migration\Version; namespace Appwrite\Migration\Version;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role; use Utopia\Database\Helpers\Role;

2
src/Appwrite/Migration/Version/V19.php
View file

@ -3,9 +3,9 @@
namespace Appwrite\Migration\Version; namespace Appwrite\Migration\Version;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception; use Utopia\Database\Exception;

2
src/Appwrite/Migration/Version/V20.php
View file

@ -4,11 +4,11 @@ namespace Appwrite\Migration\Version;
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use PDOException; use PDOException;
use Throwable; use Throwable;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;

2
src/Appwrite/Platform/Tasks/Maintenance.php
View file

@ -4,8 +4,8 @@ namespace Appwrite\Platform\Tasks;
use Appwrite\Event\Certificate; use Appwrite\Event\Certificate;
use Appwrite\Event\Delete; use Appwrite\Event\Delete;
use Appwrite\Utopia\Database\Database;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Query; use Utopia\Database\Query;

2
src/Appwrite/Platform/Tasks/Migrate.php
View file

@ -3,10 +3,10 @@
namespace Appwrite\Platform\Tasks; namespace Appwrite\Platform\Tasks;
use Appwrite\Migration\Migration; use Appwrite\Migration\Migration;
use Appwrite\Utopia\Database\Database;
use Utopia\App; use Utopia\App;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Query; use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization; use Utopia\Database\Validator\Authorization;

2
src/Appwrite/Platform/Tasks/ScheduleBase.php
View file

@ -2,9 +2,9 @@
namespace Appwrite\Platform\Tasks; namespace Appwrite\Platform\Tasks;
use Appwrite\Utopia\Database\Database;
use Swoole\Timer; use Swoole\Timer;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception; use Utopia\Database\Exception;

2
src/Appwrite/Platform/Tasks/ScheduleFunctions.php
View file

@ -3,9 +3,9 @@
namespace Appwrite\Platform\Tasks; namespace Appwrite\Platform\Tasks;
use Appwrite\Event\Func; use Appwrite\Event\Func;
use Appwrite\Utopia\Database\Database;
use Cron\CronExpression; use Cron\CronExpression;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Pools\Group; use Utopia\Pools\Group;

2
src/Appwrite/Platform/Tasks/ScheduleMessages.php
View file

@ -3,7 +3,7 @@
namespace Appwrite\Platform\Tasks; namespace Appwrite\Platform\Tasks;
use Appwrite\Event\Messaging; use Appwrite\Event\Messaging;
use Appwrite\Utopia\Database\Database; use Utopia\Database\Database;
use Utopia\Pools\Group; use Utopia\Pools\Group;
class ScheduleMessages extends ScheduleBase class ScheduleMessages extends ScheduleBase

2
src/Appwrite/Platform/Tasks/Specs.php
View file

@ -5,7 +5,6 @@ namespace Appwrite\Platform\Tasks;
use Appwrite\Specification\Format\OpenAPI3; use Appwrite\Specification\Format\OpenAPI3;
use Appwrite\Specification\Format\Swagger2; use Appwrite\Specification\Format\Swagger2;
use Appwrite\Specification\Specification; use Appwrite\Specification\Specification;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Exception; use Exception;
use Swoole\Http\Response as HttpResponse; use Swoole\Http\Response as HttpResponse;
@ -15,6 +14,7 @@ use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Adapter\MySQL; use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Database;
use Utopia\Platform\Action; use Utopia\Platform\Action;
use Utopia\Registry\Registry; use Utopia\Registry\Registry;
use Utopia\Request; use Utopia\Request;

2
src/Appwrite/Platform/Workers/Audits.php
View file

@ -2,10 +2,10 @@
namespace Appwrite\Platform\Workers; namespace Appwrite\Platform\Workers;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Throwable; use Throwable;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Structure; use Utopia\Database\Exception\Structure;

2
src/Appwrite/Platform/Workers/Builds.php
View file

@ -6,7 +6,6 @@ use Appwrite\Event\Event;
use Appwrite\Event\Func; use Appwrite\Event\Func;
use Appwrite\Event\Usage; use Appwrite\Event\Usage;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response\Model\Deployment; use Appwrite\Utopia\Response\Model\Deployment;
use Appwrite\Vcs\Comment; use Appwrite\Vcs\Comment;
use Executor\Executor; use Executor\Executor;
@ -14,6 +13,7 @@ use Swoole\Coroutine as Co;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Conflict; use Utopia\Database\Exception\Conflict;

2
src/Appwrite/Platform/Workers/Certificates.php
View file

@ -8,12 +8,12 @@ use Appwrite\Event\Mail;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Network\Validator\CNAME; use Appwrite\Network\Validator\CNAME;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response\Model\Rule; use Appwrite\Utopia\Response\Model\Rule;
use Exception; use Exception;
use Throwable; use Throwable;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;

2
src/Appwrite/Platform/Workers/Databases.php
View file

@ -4,10 +4,10 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Event\Event; use Appwrite\Event\Event;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception as DatabaseException; use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;

2
src/Appwrite/Platform/Workers/Deletes.php
View file

@ -4,7 +4,6 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Database;
use Executor\Executor; use Executor\Executor;
use Throwable; use Throwable;
use Utopia\Abuse\Abuse; use Utopia\Abuse\Abuse;
@ -14,6 +13,7 @@ use Utopia\Cache\Adapter\Filesystem;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception as DatabaseException; use Utopia\Database\Exception as DatabaseException;

2
src/Appwrite/Platform/Workers/Functions.php
View file

@ -6,12 +6,12 @@ use Appwrite\Event\Event;
use Appwrite\Event\Func; use Appwrite\Event\Func;
use Appwrite\Event\Usage; use Appwrite\Event\Usage;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Utopia\Database\Database;
use Appwrite\Utopia\Response\Model\Execution; use Appwrite\Utopia\Response\Model\Execution;
use Exception; use Exception;
use Executor\Executor; use Executor\Executor;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Conflict; use Utopia\Database\Exception\Conflict;

2
src/Appwrite/Platform/Workers/Messaging.php
View file

@ -4,10 +4,10 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Event\Usage; use Appwrite\Event\Usage;
use Appwrite\Messaging\Status as MessageStatus; use Appwrite\Messaging\Status as MessageStatus;
use Appwrite\Utopia\Database\Database;
use Swoole\Runtime; use Swoole\Runtime;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
src/Appwrite/Platform/Workers/Migrations.php
View file

@ -6,9 +6,9 @@ use Appwrite\Event\Event;
use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Permission; use Appwrite\Permission;
use Appwrite\Role; use Appwrite\Role;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Conflict; use Utopia\Database\Exception\Conflict;

2
src/Appwrite/Platform/Workers/Webhooks.php
View file

@ -4,8 +4,8 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Event\Mail; use Appwrite\Event\Mail;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Query; use Utopia\Database\Query;
use Utopia\Logger\Log; use Utopia\Logger\Log;

2
src/Appwrite/Utopia/Database/Validator/Queries/Base.php
View file

@ -2,8 +2,8 @@
namespace Appwrite\Utopia\Database\Validator\Queries; namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Database;
use Utopia\Config\Config; use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Validator\Queries; use Utopia\Database\Validator\Queries;
use Utopia\Database\Validator\Query\Cursor; use Utopia\Database\Validator\Query\Cursor;

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

@ -3,8 +3,8 @@
namespace Tests\E2E\Services\Databases; namespace Tests\E2E\Services\Databases;
use Appwrite\Extend\Exception; use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Database;
use Tests\E2E\Client; use Tests\E2E\Client;
use Utopia\Database\Database;
use Utopia\Database\DateTime; use Utopia\Database\DateTime;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
tests/e2e/Services/Databases/DatabasesCustomClientTest.php
View file

@ -2,11 +2,11 @@
namespace Tests\E2E\Services\Databases; namespace Tests\E2E\Services\Databases;
use Appwrite\Utopia\Database\Database;
use Tests\E2E\Client; use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom; use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope; use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideClient; use Tests\E2E\Scopes\SideClient;
use Utopia\Database\Database;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role; use Utopia\Database\Helpers\Role;

2
tests/e2e/Services/Databases/DatabasesCustomServerTest.php
View file

@ -3,11 +3,11 @@
namespace Tests\E2E\Services\Databases; namespace Tests\E2E\Services\Databases;
use Appwrite\Extend\Exception as AppwriteException; use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Utopia\Database\Database;
use Tests\E2E\Client; use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom; use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope; use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideServer; use Tests\E2E\Scopes\SideServer;
use Utopia\Database\Database;
use Utopia\Database\Document; use Utopia\Database\Document;
use Utopia\Database\Exception; use Utopia\Database\Exception;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;

2
tests/e2e/Services/GraphQL/DatabaseServerTest.php
View file

@ -2,12 +2,12 @@
namespace Tests\E2E\Services\GraphQL; namespace Tests\E2E\Services\GraphQL;
use Appwrite\Utopia\Database\Database;
use Exception; use Exception;
use Tests\E2E\Client; use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom; use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope; use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideServer; use Tests\E2E\Scopes\SideServer;
use Utopia\Database\Database;
use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role; use Utopia\Database\Helpers\Role;