1
0
Fork 0
mirror of synced 2024-10-01 01:37:56 +13:00

Allow shared tables namespace override

This commit is contained in:
Jake Barnby 2024-05-03 21:30:38 +12:00
parent a680b27e2b
commit c4deb0ba93
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
5 changed files with 11 additions and 9 deletions

View file

@ -7,6 +7,7 @@ use Appwrite\Event\Certificate;
use Appwrite\Event\Delete;
use Appwrite\Event\Func;
use Appwrite\Platform\Appwrite;
use Utopia\App;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
use Utopia\CLI\CLI;
@ -107,7 +108,7 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)
@ -131,7 +132,7 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)

View file

@ -211,7 +211,7 @@ App::post('/v1/projects')
$dbForProject
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$dbForProject
->setSharedTables(false)

View file

@ -1318,7 +1318,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)
@ -1366,7 +1366,7 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)

View file

@ -89,7 +89,7 @@ if (!function_exists("getProjectDB")) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)

View file

@ -16,6 +16,7 @@ use Appwrite\Event\Usage;
use Appwrite\Event\UsageDump;
use Appwrite\Platform\Appwrite;
use Swoole\Runtime;
use Utopia\App;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
use Utopia\CLI\Console;
@ -82,7 +83,7 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)
@ -110,7 +111,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)
@ -134,7 +135,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
->setNamespace(App::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
} else {
$database
->setSharedTables(false)