Merge pull request #1903 from wallabag/force-server-version

Force server version to avoid connexion error
This commit is contained in:
Nicolas Lœuillet 2016-04-10 19:57:45 +02:00
commit c5dede8445
2 changed files with 8 additions and 1 deletions

View file

@ -82,6 +82,7 @@ doctrine:
password: "%database_password%"
charset: UTF8
path: "%database_path%"
server_version: 5.6
orm:
auto_generate_proxy_classes: "%kernel.debug%"

View file

@ -455,7 +455,13 @@ class InstallCommand extends ContainerAwareCommand
return false;
}
try {
return in_array($databaseName, $schemaManager->listDatabases());
} catch (\Doctrine\DBAL\Exception\ConnectionException $e) {
// it means we weren't able to get database list, assume the database doesn't exist
return false;
}
}
/**