pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Force server version to avoid connexion error
This commit is contained in:
Nicolas Lœuillet
2016-04-10 19:57:45 +02:00
parent e9497f6fc0 69c21157ba
commit c5dede8445
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/config.yml
View File

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

8
src/Wallabag/CoreBundle/Command/InstallCommand.php
View File

@ -455,7 +455,13 @@ class InstallCommand extends ContainerAwareCommand
return false; return false;
} }
return in_array($databaseName, $schemaManager->listDatabases()); 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;
}
} }
/** /**