From f6731e3efb1a2292a26a00bd6f0572689f737298 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 13 Apr 2010 04:05:03 +0000 Subject: [PATCH] BUGFIX Float should always be not null and default 0 in the database git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102686 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/MySQLDatabase.php | 2 +- core/model/fieldtypes/Float.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/model/MySQLDatabase.php b/core/model/MySQLDatabase.php index bec87c8db..cd4136141 100755 --- a/core/model/MySQLDatabase.php +++ b/core/model/MySQLDatabase.php @@ -631,7 +631,7 @@ class MySQLDatabase extends SS_Database { //$parts=Array('datatype'=>'float'); //DB::requireField($this->tableName, $this->name, "float"); - return 'float'; + return 'float not null default ' . $values['default']; } /** diff --git a/core/model/fieldtypes/Float.php b/core/model/fieldtypes/Float.php index 7dbb458ee..e01c981ea 100644 --- a/core/model/fieldtypes/Float.php +++ b/core/model/fieldtypes/Float.php @@ -7,7 +7,7 @@ class Float extends DBField { function __construct($name, $defaultVal = 0) { - $this->defaultVal = is_float($defaultVal) ? $defaultVal : (float)0; + $this->defaultVal = is_float($defaultVal) ? $defaultVal : (float) 0; parent::__construct($name); }