From 867868a4b317065c8f16f709b5aff8a485b11e29 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 13 Jul 2026 11:46:13 +0530 Subject: [PATCH] Refine installer database selection --- app/config/variables.php | 6 +- app/views/install/installer.phtml | 3 +- .../install/installer/js/modules/context.js | 4 +- .../installer/templates/steps/step-1.phtml | 30 ++++---- src/Appwrite/Docker/Compose/Generator.php | 6 +- .../Installer/Http/Installer/Install.php | 2 +- .../Platform/Installer/Runtime/Config.php | 2 +- .../Platform/Installer/Runtime/State.php | 2 +- src/Appwrite/Platform/Tasks/Install.php | 6 +- .../Installer/Http/Installer/ViewTest.php | 72 +++++++++++++++++++ .../Modules/Installer/Runtime/ConfigTest.php | 8 +-- 11 files changed, 106 insertions(+), 35 deletions(-) create mode 100644 tests/unit/Platform/Modules/Installer/Http/Installer/ViewTest.php diff --git a/app/config/variables.php b/app/config/variables.php index ca588e5ad2..0eb43f783b 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -380,15 +380,15 @@ return [ ], [ 'category' => 'Database', - 'description' => 'Appwrite uses a database for storing user and meta data. You can choose between MariaDB, MongoDB or PostgreSQL.', + 'description' => 'Appwrite uses a database for storing user and meta data. You can choose between PostgreSQL, MariaDB or MongoDB.', 'variables' => [ [ 'name' => '_APP_DB_ADAPTER', - 'description' => 'Which database to use. Must be one of: MariaDB, MongoDB, or PostgreSQL', + 'description' => 'Which database to use. Must be one of: PostgreSQL, MariaDB, or MongoDB', 'introduction' => '1.9.0', 'default' => 'postgresql', 'required' => true, - 'question' => 'Choose your database (mariadb|mongodb|postgresql)', + 'question' => 'Choose your database (postgresql|mariadb|mongodb)', 'filter' => '' ], [ diff --git a/app/views/install/installer.phtml b/app/views/install/installer.phtml index e2422da9cf..ec262a826c 100644 --- a/app/views/install/installer.phtml +++ b/app/views/install/installer.phtml @@ -8,8 +8,7 @@ $defaultAppDomain = $vars['_APP_DOMAIN']['default'] ?? 'localhost'; $defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAppDomain; $defaultEmailCertificates ??= ''; $defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'postgresql'; -$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase; -$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql']; +$enabledDatabases ??= ['postgresql', 'mariadb', 'mongodb']; $isLocalInstall ??= false; diff --git a/app/views/install/installer/js/modules/context.js b/app/views/install/installer/js/modules/context.js index 6f215da899..db250dd03e 100644 --- a/app/views/install/installer/js/modules/context.js +++ b/app/views/install/installer/js/modules/context.js @@ -4,8 +4,8 @@ const getLockedDatabase = () => getBodyDataset().lockedDatabase || ''; const getEnabledDatabases = () => { const raw = getBodyDataset().enabledDatabases; - if (!raw) return ['mongodb', 'mariadb', 'postgresql']; - try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb', 'postgresql']; } + if (!raw) return ['postgresql', 'mariadb', 'mongodb']; + try { return JSON.parse(raw); } catch (e) { return ['postgresql', 'mariadb', 'mongodb']; } }; const STEP_IDS = Object.freeze({ diff --git a/app/views/install/installer/templates/steps/step-1.phtml b/app/views/install/installer/templates/steps/step-1.phtml index 89af45df6c..498a709aec 100644 --- a/app/views/install/installer/templates/steps/step-1.phtml +++ b/app/views/install/installer/templates/steps/step-1.phtml @@ -7,7 +7,7 @@ $defaultHttpsPort ??= '443'; $defaultEmailCertificates ??= ''; $defaultAssistantOpenAIKey ??= ''; $defaultDatabase ??= 'postgresql'; -$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql']; +$enabledDatabases ??= ['postgresql', 'mariadb', 'mongodb']; $selectedDatabase = $lockedDatabase ?: $defaultDatabase; $isDatabaseLocked = !empty($lockedDatabase); $mongoEnabled = in_array('mongodb', $enabledDatabases, true); @@ -47,15 +47,15 @@ $assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey,
- - - -
'); + $maria = strpos($html, '>MariaDB
'); + $mongo = strpos($html, '>MongoDB'); + + $this->assertNotFalse($postgres); + $this->assertNotFalse($maria); + $this->assertNotFalse($mongo); + $this->assertLessThan($maria, $postgres); + $this->assertLessThan($mongo, $maria); + } + + public function testUpgradeWithoutDetectedDatabaseRemainsSelectable(): void + { + $html = $this->render([ + 'isUpgrade' => true, + 'lockedDatabase' => null, + ]); + + $this->assertStringNotContainsString('data-locked-database=', $html); + $this->assertStringNotContainsString('selector-group is-locked', $html); + $this->assertDoesNotMatchRegularExpression('/]*disabled/', $html); + $this->assertMatchesRegularExpression('/name="database" value="postgresql"[^>]*checked/', $html); + } + + public function testUpgradeWithDetectedDatabaseRemainsLocked(): void + { + $html = $this->render([ + 'isUpgrade' => true, + 'lockedDatabase' => 'mongodb', + ]); + + $this->assertStringContainsString('data-locked-database="mongodb"', $html); + $this->assertStringContainsString('selector-group is-locked', $html); + $this->assertMatchesRegularExpression('/name="database" value="mongodb"[^>]*checked/', $html); + $this->assertMatchesRegularExpression('/name="database" value="postgresql"[^>]*disabled/', $html); + } + + private function render(array $values = []): string + { + $step = 1; + $isUpgrade = false; + $lockedDatabase = null; + $vars = []; + $enabledDatabases = ['postgresql', 'mariadb', 'mongodb']; + $csrfToken = 'test-token'; + + extract($values, EXTR_OVERWRITE); + + ob_start(); + try { + include dirname(__DIR__, 7) . '/app/views/install/installer.phtml'; + return (string) ob_get_clean(); + } catch (Throwable $error) { + ob_end_clean(); + throw $error; + } + } +} diff --git a/tests/unit/Platform/Modules/Installer/Runtime/ConfigTest.php b/tests/unit/Platform/Modules/Installer/Runtime/ConfigTest.php index a539ae9b12..b6cb4e7ee5 100644 --- a/tests/unit/Platform/Modules/Installer/Runtime/ConfigTest.php +++ b/tests/unit/Platform/Modules/Installer/Runtime/ConfigTest.php @@ -22,7 +22,7 @@ final class ConfigTest extends TestCase $this->assertFalse($config->isLocal()); $this->assertNull($config->getHostPath()); $this->assertNull($config->getLockedDatabase()); - $this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases()); + $this->assertSame(['postgresql', 'mariadb', 'mongodb'], $config->getEnabledDatabases()); $this->assertEmpty($config->getVars()); } @@ -439,7 +439,7 @@ final class ConfigTest extends TestCase $this->assertFalse($array['isLocal']); $this->assertNull($array['hostPath']); $this->assertNull($array['lockedDatabase']); - $this->assertEquals(['mongodb', 'mariadb', 'postgresql'], $array['enabledDatabases']); + $this->assertEquals(['postgresql', 'mariadb', 'mongodb'], $array['enabledDatabases']); } public function testMultipleApplyCallsAccumulate(): void @@ -494,7 +494,7 @@ final class ConfigTest extends TestCase public function testDefaultEnabledDatabases(): void { $config = new Config(); - $this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases()); + $this->assertSame(['postgresql', 'mariadb', 'mongodb'], $config->getEnabledDatabases()); $this->assertTrue($config->isDatabaseEnabled('mongodb')); $this->assertTrue($config->isDatabaseEnabled('mariadb')); $this->assertTrue($config->isDatabaseEnabled('postgresql')); @@ -535,7 +535,7 @@ final class ConfigTest extends TestCase { $config = new Config(); $config->apply(['enabledDatabases' => 'mongodb']); - $this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases()); + $this->assertSame(['postgresql', 'mariadb', 'mongodb'], $config->getEnabledDatabases()); } public function testEnabledDatabasesInToArray(): void