diff --git a/app/config/variables.php b/app/config/variables.php index f8d7d374e4..0eb43f783b 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -380,31 +380,31 @@ 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' => 'mongodb', + 'default' => 'postgresql', 'required' => true, - 'question' => 'Choose your database (mariadb|mongodb|postgresql)', + 'question' => 'Choose your database (postgresql|mariadb|mongodb)', 'filter' => '' ], [ 'name' => '_APP_DB_HOST', - 'description' => 'Database server host name address. Default value is: \'mongodb\'.', + 'description' => 'Database server host name address. Default value is: \'postgresql\'.', 'introduction' => '', - 'default' => 'mongodb', + 'default' => 'postgresql', 'required' => false, 'question' => '', 'filter' => '' ], [ 'name' => '_APP_DB_PORT', - 'description' => 'Database server TCP port. Default value is: \'27017\'.', + 'description' => 'Database server TCP port. Default value is: \'5432\'.', 'introduction' => '', - 'default' => '27017', + 'default' => '5432', 'required' => false, 'question' => '', 'filter' => '' diff --git a/app/views/install/installer.phtml b/app/views/install/installer.phtml index d5e4383f48..ec262a826c 100644 --- a/app/views/install/installer.phtml +++ b/app/views/install/installer.phtml @@ -7,9 +7,8 @@ $defaultHttpsPort ??= '443'; $defaultAppDomain = $vars['_APP_DOMAIN']['default'] ?? 'localhost'; $defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAppDomain; $defaultEmailCertificates ??= ''; -$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb'; -$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase; -$enabledDatabases ??= ['mongodb', 'mariadb']; +$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'postgresql'; +$enabledDatabases ??= ['postgresql', 'mariadb', 'mongodb']; $isLocalInstall ??= false; @@ -122,7 +121,9 @@ $installerVersion = @filemtime(__DIR__ . '/installer/js/installer.js') ?: time()
- +
diff --git a/app/views/install/installer/js/modules/context.js b/app/views/install/installer/js/modules/context.js index 36b85a3843..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']; - try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb']; } + 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/js/modules/progress.js b/app/views/install/installer/js/modules/progress.js index 7c36fd7951..e5dbb0676b 100644 --- a/app/views/install/installer/js/modules/progress.js +++ b/app/views/install/installer/js/modules/progress.js @@ -367,7 +367,7 @@ installId, httpPort: normalizedHttpPort, httpsPort: normalizedHttpsPort, - database: formState?.database || 'mongodb', + database: formState?.database || 'postgresql', appDomain: normalizedDomain, emailCertificates: normalizedEmail, opensslKey: (formState?.opensslKey || '').trim(), diff --git a/app/views/install/installer/templates/steps/step-1.phtml b/app/views/install/installer/templates/steps/step-1.phtml index e7d356745b..498a709aec 100644 --- a/app/views/install/installer/templates/steps/step-1.phtml +++ b/app/views/install/installer/templates/steps/step-1.phtml @@ -6,8 +6,8 @@ $defaultHttpPort ??= '80'; $defaultHttpsPort ??= '443'; $defaultEmailCertificates ??= ''; $defaultAssistantOpenAIKey ??= ''; -$defaultDatabase ??= 'mongodb'; -$enabledDatabases ??= ['mongodb', 'mariadb']; +$defaultDatabase ??= '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 7f0faafcbc..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'], $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'], $array['enabledDatabases']); + $this->assertEquals(['postgresql', 'mariadb', 'mongodb'], $array['enabledDatabases']); } public function testMultipleApplyCallsAccumulate(): void @@ -494,10 +494,10 @@ final class ConfigTest extends TestCase public function testDefaultEnabledDatabases(): void { $config = new Config(); - $this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases()); + $this->assertSame(['postgresql', 'mariadb', 'mongodb'], $config->getEnabledDatabases()); $this->assertTrue($config->isDatabaseEnabled('mongodb')); $this->assertTrue($config->isDatabaseEnabled('mariadb')); - $this->assertFalse($config->isDatabaseEnabled('postgresql')); + $this->assertTrue($config->isDatabaseEnabled('postgresql')); } public function testSetEnabledDatabases(): void @@ -535,7 +535,7 @@ final class ConfigTest extends TestCase { $config = new Config(); $config->apply(['enabledDatabases' => 'mongodb']); - $this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases()); + $this->assertSame(['postgresql', 'mariadb', 'mongodb'], $config->getEnabledDatabases()); } public function testEnabledDatabasesInToArray(): void