Fix 'point' type being interpreted as int.

Fallback to 'string' until we can properly sort out how to handle point types. Fixes #2953
cakephp · Apr 2, 2014 · 211371d · 211371d
1 parent 9584cc9
commit 211371d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Database/Schema/MysqlSchema.php b/src/Database/Schema/MysqlSchema.php
@@ -80,7 +80,7 @@ protected function _convertColumn($column) {
 		if (strpos($col, 'bigint') !== false || $col === 'bigint') {
 			return ['type' => 'biginteger', 'length' => $length, 'unsigned' => $unsigned];
 		}
-		if (strpos($col, 'int') !== false) {
+		if (in_array($col, ['int', 'integer', 'tinyint', 'smallint', 'mediumint'])) {
 			return ['type' => 'integer', 'length' => $length, 'unsigned' => $unsigned];
 		}
 		if ($col === 'char' && $length === 36) {

diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -67,6 +67,10 @@ public static function convertColumnProvider() {
 				'INTEGER(11)',
 				['type' => 'integer', 'length' => 11, 'unsigned' => false]
 			],
+			[
+				'MEDIUMINT(11)',
+				['type' => 'integer', 'length' => 11, 'unsigned' => false]
+			],
 			[
 				'INTEGER(11) UNSIGNED',
 				['type' => 'integer', 'length' => 11, 'unsigned' => true]