composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 01:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Completion of [3668]: #1116 (and #1117): default values for ENUMs must always be expressed as strings.

Browse Source 
SVN:trunk[3683]
This commit is contained in:
Romain Quetiez
2015-08-17 16:14:24 +00:00
parent a30cb0b4c4
commit 3fc19bf160
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/cmdbsource.class.inc.php
View File

@@ -554,8 +554,16 @@ class CMDBSource
}
if (is_numeric($aFieldData["Default"]))
{
$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
$sRet .= ' DEFAULT '.self::Quote($default);
if (strtolower(substr($aFieldData["Type"], 0, 5)) == 'enum(')
{
// Force quotes to match the column declaration statement
$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"], true);
}
else
{
$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
$sRet .= ' DEFAULT '.self::Quote($default);
}
}
elseif (is_string($aFieldData["Default"]) == 'string')
{