Fix SQLServer tests and add missing coverage.

cakephp · Mar 10, 2017 · 248ad97 · 248ad97
1 parent 9102690
commit 248ad97
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/Database/Schema/SqlserverSchema.php b/src/Database/Schema/SqlserverSchema.php
@@ -89,7 +89,7 @@ protected function _convertColumn($col, $length = null, $precision = null, $scal
         }
 
         if ($col === 'tinyint') {
-            return ['type' => 'smallint', 'length' => $precision ?: 3];
+            return ['type' => 'tinyint', 'length' => $precision ?: 3];
         }
         if ($col === 'smallint') {
             return ['type' => 'smallint', 'length' => $precision ?: 5];

diff --git a/tests/TestCase/Database/Schema/SqlserverSchemaTest.php b/tests/TestCase/Database/Schema/SqlserverSchemaTest.php
@@ -112,16 +112,30 @@ public static function convertColumnProvider()
             [
                 'TINYINT',
                 null,
-                4,
+                2,
                 null,
-                ['type' => 'tinyint', 'length' => 4]
+                ['type' => 'tinyint', 'length' => 2]
+            ],
+            [
+                'TINYINT',
+                null,
+                null,
+                null,
+                ['type' => 'tinyint', 'length' => 3]
             ],
             [
                 'SMALLINT',
                 null,
-                4,
+                3,
+                null,
+                ['type' => 'smallint', 'length' => 3]
+            ],
+            [
+                'SMALLINT',
+                null,
+                null,
                 null,
-                ['type' => 'smallint', 'length' => 4]
+                ['type' => 'smallint', 'length' => 5]
             ],
             [
                 'INTEGER',