From 1c9d77d2062e2f38828f6ea32cee844acf0eda95 Mon Sep 17 00:00:00 2001 From: Tao Sasaki <485749+tao-s@users.noreply.github.com> Date: Wed, 22 Sep 2021 01:29:11 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=83=99=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=81=8C=E5=B8=B8=E3=81=ABsqlite=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=A6=E5=8B=95?= =?UTF-8?q?=E3=81=8B=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Command/InstallerCommand.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Command/InstallerCommand.php b/src/Eccube/Command/InstallerCommand.php index 120fabbcee6..0b69464105a 100644 --- a/src/Eccube/Command/InstallerCommand.php +++ b/src/Eccube/Command/InstallerCommand.php @@ -130,6 +130,7 @@ protected function interact(InputInterface $input, OutputInterface $output) $databaseUrl = 'sqlite:///var/eccube.db'; } $this->envFileUpdater->databaseUrl = $this->io->ask('Database Url', $databaseUrl); + $databaseUrl = $this->envFileUpdater->databaseUrl; // DATABASE_SERVER_VERSION $this->envFileUpdater->serverVersion = $this->getDatabaseServerVersion($databaseUrl); @@ -252,7 +253,7 @@ protected function getDatabaseName($databaseUrl) if (0 === strpos($databaseUrl, 'sqlite')) { return 'sqlite'; } - if (0 === strpos($databaseUrl, 'postgres')) { + if (0 === strpos($databaseUrl, 'postgres') || 0 === strpos($databaseUrl, 'pgsql')) { return 'postgres'; } if (0 === strpos($databaseUrl, 'mysql')) {