diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php index 8251fc34b57..6a7f3576a78 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlite.php +++ b/lib/Cake/Model/Datasource/Database/Sqlite.php @@ -73,6 +73,7 @@ class Sqlite extends DboSource { 'integer' => array('name' => 'integer', 'limit' => null, 'formatter' => 'intval'), 'biginteger' => array('name' => 'bigint', 'limit' => 20), 'float' => array('name' => 'float', 'formatter' => 'floatval'), + 'decimal' => array('name' => 'decimal', 'formatter' => 'floatval'), 'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), 'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), 'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'), @@ -278,7 +279,7 @@ public function column($real) { return 'binary'; } if (strpos($col, 'numeric') !== false || strpos($col, 'decimal') !== false) { - return 'float'; + return 'decimal'; } return 'text'; } diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php index a121da5753e..5fae5688c81 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php @@ -363,6 +363,12 @@ public function testDatatypes() { 'default' => '', 'length' => '5,2', ), + 'decimal_field' => array( + 'type' => 'decimal', + 'null' => true, + 'default' => '0.000', + 'length' => '6,3', + ), 'huge_int' => array( 'type' => 'biginteger', 'null' => true,