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 #1769 from wilr/doubleduplication

Browse Source 
Remove duplicate functionality between float and double
This commit is contained in:
Ingo Schommer 2013-04-17 01:15:30 -07:00
commit a7574f0450
1 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
model/fieldtypes/Double.php
View File

@ -4,11 +4,10 @@
* @package framework * @package framework
* @subpackage model * @subpackage model
*/ */
class Double extends DBField { class Double extends Float {
public function requireField() { public function requireField() {
// HACK: MSSQL does not support double so we're using float instead
// HACK: MSSQL does not support double so we're usinf float instead
// @todo This should go into MSSQLDatabase ideally somehow // @todo This should go into MSSQLDatabase ideally somehow
if(DB::getConn() instanceof MySQLDatabase) { if(DB::getConn() instanceof MySQLDatabase) {
DB::requireField($this->tableName, $this->name, "double"); DB::requireField($this->tableName, $this->name, "double");
@ -16,36 +15,4 @@ class Double extends DBField {
DB::requireField($this->tableName, $this->name, "float"); DB::requireField($this->tableName, $this->name, "float");
} }
} }
public function Nice() {
return number_format($this->value, 2);
}
/**
* Returns the value to be set in the database to blank this field.
* Usually it's a choice between null, 0, and ''
*/
public function nullValue() {
return 0;
}
/**
* Return an encoding of the given value suitable for inclusion in a SQL statement.
* If necessary, this should include quotes.
*/
public function prepValueForDB($value) {
if($value === true) {
return 1;
}
if(!$value || !is_numeric($value)) {
if(strpos($value, '[') === false) {
return '0';
} else {
return Convert::raw2sql($value);
}
} else {
return Convert::raw2sql($value);
}
}
} }