Fixed tests

src/Database/Schema/Table.php

@@ -363,9 +363,7 @@ class Table
             return null;
         }
 
-        $map = Type::map($type);
-
-        if (isset($map[$type])) {
+        if (Type::map($type)) {
             $type = Type::build($type)->getBaseType();
         }
         return $this->_columns[$column]['baseType'] = $type;

tests/TestCase/Database/Schema/MysqlSchemaTest.php

@@ -254,6 +254,7 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'biginteger',
+                'baseType' => null,
                 'null' => false,
                 'unsigned' => false,
                 'default' => null,
@@ -264,6 +265,7 @@ SQL;
             ],
             'title' => [
                 'type' => 'string',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => 20,
@@ -273,6 +275,7 @@ SQL;
             ],
             'body' => [
                 'type' => 'text',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -281,6 +284,7 @@ SQL;
             ],
             'author_id' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => false,
                 'unsigned' => false,
                 'default' => null,
@@ -291,6 +295,7 @@ SQL;
             ],
             'published' => [
                 'type' => 'boolean',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -299,6 +304,7 @@ SQL;
             ],
             'allow_comments' => [
                 'type' => 'boolean',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -307,6 +313,7 @@ SQL;
             ],
             'created' => [
                 'type' => 'datetime',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,

tests/TestCase/Database/Schema/PostgresSchemaTest.php

@@ -277,6 +277,7 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'biginteger',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 20,
@@ -287,6 +288,7 @@ SQL;
             ],
             'title' => [
                 'type' => 'string',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => 20,
@@ -296,6 +298,7 @@ SQL;
             ],
             'body' => [
                 'type' => 'text',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -304,6 +307,7 @@ SQL;
             ],
             'author_id' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 10,
@@ -314,6 +318,7 @@ SQL;
             ],
             'published' => [
                 'type' => 'boolean',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -322,6 +327,7 @@ SQL;
             ],
             'views' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => 5,
@@ -332,6 +338,7 @@ SQL;
             ],
             'created' => [
                 'type' => 'timestamp',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,

tests/TestCase/Database/Schema/SqliteSchemaTest.php

@@ -277,6 +277,7 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => null,
@@ -287,6 +288,7 @@ SQL;
             ],
             'title' => [
                 'type' => 'string',
+                'baseType' => null,
                 'null' => true,
                 'default' => 'testing',
                 'length' => 20,
@@ -296,6 +298,7 @@ SQL;
             ],
             'body' => [
                 'type' => 'text',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -304,6 +307,7 @@ SQL;
             ],
             'author_id' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 11,
@@ -314,6 +318,7 @@ SQL;
             ],
             'published' => [
                 'type' => 'boolean',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -322,6 +327,7 @@ SQL;
             ],
             'created' => [
                 'type' => 'datetime',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,

tests/TestCase/Database/Schema/SqlserverSchemaTest.php

@@ -283,6 +283,7 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'biginteger',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 19,
@@ -293,6 +294,7 @@ SQL;
             ],
             'title' => [
                 'type' => 'string',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => 20,
@@ -302,6 +304,7 @@ SQL;
             ],
             'body' => [
                 'type' => 'string',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => 1000,
@@ -311,6 +314,7 @@ SQL;
             ],
             'author_id' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 10,
@@ -321,6 +325,7 @@ SQL;
             ],
             'published' => [
                 'type' => 'boolean',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -329,6 +334,7 @@ SQL;
             ],
             'views' => [
                 'type' => 'integer',
+                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => 5,
@@ -339,6 +345,7 @@ SQL;
             ],
             'created' => [
                 'type' => 'timestamp',
+                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,

tests/TestCase/Database/Schema/TableTest.php

@@ -41,9 +41,19 @@ class TableTest extends TestCase
 
     public $fixtures = ['core.articles_tags', 'core.products', 'core.orders', 'core.tags'];
 
+    protected $_map;
+
+    public function setUp()
+    {
+        $this->_map = Type::map();
+        parent::setUp();
+    }
+
     public function tearDown()
     {
         TableRegistry::clear();
+        Type::clear();
+        Type::map($this->_map);
         parent::tearDown();
     }