From c02bc2ef070732268fc738e157a55bd55f87b188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Wed, 13 Nov 2013 19:14:54 +0100 Subject: [PATCH 1/2] Changed .mo files from text to binary Kudos to @ADmad https://github.com/cakephp/cakephp/commit/ab2edbe4ddd78ad6fc9b9887d3a6c5d0259829e3#commitcomment-4555720 --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 357c93035..fc3f49166 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,7 +9,6 @@ *.ctp text *.sql text *.md text -*.mo text *.po text *.js text *.css text @@ -30,4 +29,5 @@ *.png binary *.jpg binary *.gif binary -*.ico binary \ No newline at end of file +*.ico binary +*.mo binary \ No newline at end of file From b6b8d8398011537f6459412ace37dcdff0ad0423 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 14 Nov 2013 10:28:09 -0500 Subject: [PATCH 2/2] Remove non-portable data type from MySQL. 'numeric' is a non-portable type that is not supported by any other database driver. Removing it now will prevent future problems. --- lib/Cake/Model/Datasource/Database/Mysql.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php index 33b44c558..129df1b5f 100644 --- a/lib/Cake/Model/Datasource/Database/Mysql.php +++ b/lib/Cake/Model/Datasource/Database/Mysql.php @@ -112,7 +112,6 @@ class Mysql extends DboSource { 'biginteger' => array('name' => 'bigint', 'limit' => '20'), 'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'), 'float' => array('name' => 'float', 'formatter' => 'floatval'), - 'numeric' => array('name' => 'decimal', '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'),