Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Supporting old project database name

Browse source
This commit is contained in:
Binyamin Yawitz 2024-07-19 13:49:10 -04:00
parent 05862e8bc0
commit 7d14a8b742
No known key found for this signature in database
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/init2.php
View file

@ -99,6 +99,11 @@ if (!Http::isProduction()) {
PublicDomain::allow(['request-catcher']);
}
function backwardDBName($db): string
{
return str_replace('database_db_main', 'db_main', $db);
}
function getDevice($root): Device
{
$connection = System::getEnv('_APP_CONNECTIONS_STORAGE', '');
@ -203,7 +208,7 @@ $global->set('logger', function () {
$configChunks = \explode(";", $providerConfig);
$providerConfig = match ($providerName) {
'sentry' => [ 'key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
'sentry' => ['key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
'logowl' => ['ticket' => $configChunks[0] ?? '', 'host' => ''],
default => ['key' => $providerConfig],
};
@ -758,10 +763,10 @@ $dbForProject
}
try {
$dsn = new DSN($project->getAttribute('database'));
$dsn = new DSN(backwardDBName($project->getAttribute('database')));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
$dsn = new DSN('mysql://' . backwardDBName($project->getAttribute('database')));
}
$pool = $pools['pools-database-' . $dsn->getHost()]['pool'];
@ -780,10 +785,10 @@ $dbForProject
$database = new Database($adapter, $cache);
try {
$dsn = new DSN($project->getAttribute('database'));
$dsn = new DSN(backwardDBName($project->getAttribute('database')));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
$dsn = new DSN('mysql://' . backwardDBName($project->getAttribute('database')));
}
if ($dsn->getHost() === DATABASE_SHARED_TABLES) {
@ -1154,10 +1159,10 @@ $getProjectDB
}
try {
$dsn = new DSN($project->getAttribute('database'));
$dsn = new DSN(backwardDBName($project->getAttribute('database')));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
$dsn = new DSN('mysql://' . backwardDBName($project->getAttribute('database')));
}
if (isset($databases[$dsn->getHost()])) {