tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4731 from tractorcow/pulls/3.2/fix-numeric-regeneration

Browse Source 
BUG Prevent dev/build continually regenerating Number field type
This commit is contained in:
Daniel Hensby 2015-11-10 23:06:18 +00:00
commit 46eaee5be1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/connect/MySQLSchemaManager.php
View File

@ -407,15 +407,17 @@ class MySQLSchemaManager extends DBSchemaManager {
$precision = $values['precision']; $precision = $values['precision'];
} }
$defaultValue = ''; // Fix format of default value to match precision
if (isset($values['default']) && is_numeric($values['default'])) { if (isset($values['default']) && is_numeric($values['default'])) {
$decs = strpos($precision, ',') !== false $decs = strpos($precision, ',') !== false
? (int) substr($precision, strpos($precision, ',') + 1) ? (int) substr($precision, strpos($precision, ',') + 1)
: 0; : 0;
$defaultValue = ' default ' . number_format($values['default'], $decs, '.', ''); $values['default'] = number_format($values['default'], $decs, '.', '');
} else {
unset($values['default']);
} }
return "decimal($precision) not null $defaultValue"; return "decimal($precision) not null" . $this->defaultClause($values);
} }
/** /**

5
tests/model/DataObjectSchemaGenerationTest.php
View File

@ -178,6 +178,11 @@ class DataObjectSchemaGenerationTest_DO extends DataObject implements TestOnly {
private static $db = array( private static $db = array(
'Enum1' => 'Enum("A, B, C, D","")', 'Enum1' => 'Enum("A, B, C, D","")',
'Enum2' => 'Enum("A, B, C, D","A")', 'Enum2' => 'Enum("A, B, C, D","A")',
'NumberField' => 'Decimal',
'FloatingField' => 'Decimal(10,3,1.1)',
'TextValue' => 'Varchar',
'Date' => 'SS_Datetime',
'MyNumber' => 'Int'
); );
} }