Merge pull request #5174 from tao-s/patch-21

データベースが常にsqliteになってしまって動かない不具合の修正

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')) {