From e366fabd551952d5aa79ebe509e62c644130cc6d Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Wed, 17 Apr 2013 17:35:59 +1200 Subject: [PATCH] Remove duplicate functionality between float and double --- model/fieldtypes/Double.php | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/model/fieldtypes/Double.php b/model/fieldtypes/Double.php index e82d1ea2f..e528f1fc6 100644 --- a/model/fieldtypes/Double.php +++ b/model/fieldtypes/Double.php @@ -4,11 +4,10 @@ * @package framework * @subpackage model */ -class Double extends DBField { +class Double extends Float { public function requireField() { - - // HACK: MSSQL does not support double so we're usinf float instead + // HACK: MSSQL does not support double so we're using float instead // @todo This should go into MSSQLDatabase ideally somehow if(DB::getConn() instanceof MySQLDatabase) { DB::requireField($this->tableName, $this->name, "double"); @@ -16,36 +15,4 @@ class Double extends DBField { 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); - } - } - }