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

API CHANGE Decimal now allows setting a default value properly

Browse Source 
MINOR Unit tests for Decimal field type default value through new test class DecimalTest (from r98056)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102571 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 01:53:13 +00:00
parent 529ed1dd1d
commit a5dde231b6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/model/MySQLDatabase.php
View File

@ -582,7 +582,12 @@ class MySQLDatabase extends SS_Database {
$precision = $values['precision']; $precision = $values['precision'];
} }
return 'decimal(' . $precision . ') not null'; $defaultValue = '';
if(isset($values['default']) && is_numeric($values['default'])) {
$defaultValue = ' default ' . $values['default'];
}
return 'decimal(' . $precision . ') not null' . $defaultValue;
} }
/** /**

7
core/model/fieldtypes/Decimal.php
View File

@ -5,14 +5,15 @@
* @subpackage model * @subpackage model
*/ */
class Decimal extends DBField { class Decimal extends DBField {
protected $wholeSize, $decimalSize; protected $wholeSize, $decimalSize, $defaultValue;
/** /**
* Create a new Decimal field. * Create a new Decimal field.
*/ */
function __construct($name, $wholeSize = 9, $decimalSize = 2) { function __construct($name, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
$this->wholeSize = isset($wholeSize) ? $wholeSize : 9; $this->wholeSize = isset($wholeSize) ? $wholeSize : 9;
$this->decimalSize = isset($decimalSize) ? $decimalSize : 2; $this->decimalSize = isset($decimalSize) ? $decimalSize : 2;
$this->defaultValue = $defaultValue;
parent::__construct($name); parent::__construct($name);
} }
@ -25,7 +26,7 @@ class Decimal extends DBField {
} }
function requireField() { function requireField() {
$parts=Array('datatype'=>'decimal', 'precision'=>"$this->wholeSize,$this->decimalSize", 'arrayValue'=>$this->arrayValue); $parts=Array('datatype'=>'decimal', 'precision'=>"$this->wholeSize,$this->decimalSize", 'default'=>$this->defaultValue, 'arrayValue'=>$this->arrayValue);
$values=Array('type'=>'decimal', 'parts'=>$parts); $values=Array('type'=>'decimal', 'parts'=>$parts);
DB::requireField($this->tableName, $this->name, $values); DB::requireField($this->tableName, $this->name, $values);
} }