mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3697 from SimSync/fix_current_timestamp

Browse Source 
fixes e107inc/vstore#99: Difference between MariaDB and MySQL table def
This commit is contained in:
Cameron
2019-03-01 08:47:11 -08:00
committed by GitHub
parent c8a975d073 dc675c66e4
commit 8e5fd33494
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/db_verify_class.php
View File

@@ -152,6 +152,13 @@ class db_verify
$actual['default'] = preg_replace("/DEFAULT '(\d*\.?\d*)'/i", 'DEFAULT $1', $actual['default'] );
}
// Correct difference on CREATE TABLE statement between MariaDB and MySQL
if(1 === preg_match('/(DATE|DATETIME|TIMESTAMP|TIME|YEAR)/i', $expected['default']))
{
$expected['default'] = preg_replace("/CURRENT_TIMESTAMP\(\)/i", 'CURRENT_TIMESTAMP', $expected['default']);
$actual['default'] = preg_replace("/CURRENT_TIMESTAMP\(\)/i", 'CURRENT_TIMESTAMP', $actual['default'] );
}
return array_diff_assoc($expected, $actual);
}