mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Add verification check for MySQL version

Browse source 
Must now be >= 5.5.4
This commit is contained in:
Jeremy Benoist 2016-10-22 13:41:03 +02:00
parent b0de88f75d
commit fc79f1ffa8
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/config/parameters.yml.dist
View file

@ -19,8 +19,8 @@ parameters:
database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
database_table_prefix: wallabag_ database_table_prefix: wallabag_
database_socket: null database_socket: null
# with MySQL, use "utf8mb4" if got problem with content with emojis # with MySQL, use "utf8mb4" if you got problem with content with emojis
database_charset: utf8mb4 database_charset: utf8
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1

2
app/config/tests/parameters_test.sqlite.yml
View file

@ -6,4 +6,4 @@ parameters:
test_database_user: ~ test_database_user: ~
test_database_password: ~ test_database_password: ~
test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
test_database_charset: utf8mb4 test_database_charset: utf8

18
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -95,7 +95,8 @@ class InstallCommand extends ContainerAwareCommand
$help = ''; $help = '';
try { try {
$this->getContainer()->get('doctrine')->getManager()->getConnection()->connect(); $conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
$conn->connect();
} catch (\Exception $e) { } catch (\Exception $e) {
if (false === strpos($e->getMessage(), 'Unknown database') if (false === strpos($e->getMessage(), 'Unknown database')
&& false === strpos($e->getMessage(), 'database "'.$this->getContainer()->getParameter('database_name').'" does not exist')) { && false === strpos($e->getMessage(), 'database "'.$this->getContainer()->getParameter('database_name').'" does not exist')) {
@ -107,6 +108,21 @@ class InstallCommand extends ContainerAwareCommand
$rows[] = [$label, $status, $help]; $rows[] = [$label, $status, $help];
// now check if MySQL isn't too old to handle utf8mb4
if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
$version = $conn->query('select version()')->fetchColumn();
$minimalVersion = '5.5.4';
if (false === version_compare($version, $minimalVersion, '>')) {
$fulfilled = false;
$rows[] = [
'<comment>Database version</comment>',
'<error>ERROR!</error>',
'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).'
];
}
}
foreach ($this->functionExists as $functionRequired) { foreach ($this->functionExists as $functionRequired) {
$label = '<comment>'.$functionRequired.'</comment>'; $label = '<comment>'.$functionRequired.'</comment>';
$status = '<info>OK!</info>'; $status = '<info>OK!</info>';