mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Keep PostgreSQL disabled by default in installer
This commit is contained in:
6 files changed
+19
-14
No files matched your search
@@ -9,7 +9,7 @@ $defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAp
|
||||
$defaultEmailCertificates ??= '';
|
||||
$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb';
|
||||
$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase;
|
||||
$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql'];
|
||||
$enabledDatabases ??= ['mongodb', 'mariadb'];
|
||||
$isLocalInstall ??= false;
|
||||
|
||||
|
||||
|
||||
@@ -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 ['mongodb', 'mariadb'];
|
||||
try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb']; }
|
||||
};
|
||||
|
||||
const STEP_IDS = Object.freeze({
|
||||
|
||||
@@ -7,7 +7,7 @@ $defaultHttpsPort ??= '443';
|
||||
$defaultEmailCertificates ??= '';
|
||||
$defaultAssistantOpenAIKey ??= '';
|
||||
$defaultDatabase ??= 'mongodb';
|
||||
$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql'];
|
||||
$enabledDatabases ??= ['mongodb', 'mariadb'];
|
||||
$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
|
||||
$isDatabaseLocked = !empty($lockedDatabase);
|
||||
$mongoEnabled = in_array('mongodb', $enabledDatabases, true);
|
||||
|
||||
@@ -27,7 +27,7 @@ final class Config
|
||||
private bool $isLocal = false;
|
||||
private ?string $hostPath = null;
|
||||
private ?string $lockedDatabase = null;
|
||||
private array $enabledDatabases = ['mongodb', 'mariadb', 'postgresql'];
|
||||
private array $enabledDatabases = ['mongodb', 'mariadb'];
|
||||
private array $vars = [];
|
||||
|
||||
public function __construct(array $values = [])
|
||||
|
||||
@@ -102,6 +102,8 @@ class Install extends Action
|
||||
$envFileExists = file_exists($this->path . '/' . $this->getEnvFileName());
|
||||
$existingInstallation = $data !== '' || $envFileExists;
|
||||
|
||||
$existingDatabase = null;
|
||||
|
||||
if ($existingInstallation) {
|
||||
$time = \time();
|
||||
$composeFileName = $this->getComposeFileName();
|
||||
@@ -171,7 +173,6 @@ class Install extends Action
|
||||
// Detect database type from existing installation.
|
||||
// 1.9.0+ installs have _APP_DB_ADAPTER; pre-1.9.0 installs
|
||||
// can be detected by the DB service name or _APP_DB_HOST.
|
||||
$existingDatabase = null;
|
||||
foreach ($compose->getServices() as $service) {
|
||||
$svcEnv = $service->getEnvironment()->list();
|
||||
if (isset($svcEnv['_APP_DB_ADAPTER'])) {
|
||||
@@ -199,8 +200,9 @@ class Install extends Action
|
||||
}
|
||||
|
||||
$installerConfig = $this->readInstallerConfig();
|
||||
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb', 'postgresql'];
|
||||
if (!in_array($database, $enabledDatabases, true)) {
|
||||
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb'];
|
||||
$isExistingDatabase = $isUpgrade && $existingDatabase !== null && $database === $existingDatabase;
|
||||
if (!in_array($database, $enabledDatabases, true) && !$isExistingDatabase) {
|
||||
Console::error("Database '{$database}' is not available. Available options: " . implode(', ', $enabledDatabases));
|
||||
Console::exit(1);
|
||||
}
|
||||
@@ -331,7 +333,10 @@ class Install extends Action
|
||||
$state->clearStaleLock();
|
||||
|
||||
$installerConfig = $this->readInstallerConfig();
|
||||
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb', 'postgresql'];
|
||||
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb'];
|
||||
if ($isUpgrade && $lockedDatabase !== null && !in_array($lockedDatabase, $enabledDatabases, true)) {
|
||||
$enabledDatabases[] = $lockedDatabase;
|
||||
}
|
||||
|
||||
$this->setInstallerConfig([
|
||||
'defaultHttpPort' => $defaultHttpPort,
|
||||
|
||||
@@ -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(['mongodb', 'mariadb'], $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(['mongodb', 'mariadb'], $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', 'postgresql'], $config->getEnabledDatabases());
|
||||
$this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases());
|
||||
$this->assertTrue($config->isDatabaseEnabled('mongodb'));
|
||||
$this->assertTrue($config->isDatabaseEnabled('mariadb'));
|
||||
$this->assertTrue($config->isDatabaseEnabled('postgresql'));
|
||||
$this->assertFalse($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', 'postgresql'], $config->getEnabledDatabases());
|
||||
$this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases());
|
||||
}
|
||||
|
||||
public function testEnabledDatabasesInToArray(): void
|
||||
|
||||
Reference in new issue
Block a user