mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-10 08:34:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3012 from Deltik/fix-3011

Browse Source 
Permissive numeric field validation in db_verify
This commit is contained in:
Cameron
2018-01-28 13:24:24 -08:00
committed by GitHub
parent df591077fb 1c75486642
commit 2398bc12c0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/db_verify_class.php Normal file → Executable file
View File

@@ -147,11 +147,11 @@ class db_verify
$expected['default'] = $actual['default']; $expected['default'] = $actual['default'];
} }
// Loosely typed default value for int-like types // Loosely typed default value for numeric types
if(1 === preg_match('/[A-Z]*INT/i', $expected['type'])) if(1 === preg_match('/([A-Z]*INT|NUMERIC|DEC|FIXED|FLOAT|REAL|DOUBLE)/i', $expected['type']))
{ {
$expected['default'] = preg_replace("/DEFAULT '(\d+)'/i", 'DEFAULT $1', $expected['default']); $expected['default'] = preg_replace("/DEFAULT '(\d*\.?\d*)'/i", 'DEFAULT $1', $expected['default']);
$actual['default'] = preg_replace("/DEFAULT '(\d+)'/i", 'DEFAULT $1', $actual['default'] ); $actual['default'] = preg_replace("/DEFAULT '(\d*\.?\d*)'/i", 'DEFAULT $1', $actual['default'] );
} }
return array_diff_assoc($expected, $actual); return array_diff_assoc($expected, $actual);