Removing baseType from the output of Table::column()

This makes the output less confusing and also more backwards compatible

src/Database/Schema/Table.php

@@ -321,7 +321,9 @@ class Table
         if (!isset($this->_columns[$name])) {
             return null;
         }
-        return $this->_columns[$name];
+        $column = $this->_columns[$name];
+        unset($column['baseType']);
+        return $column;
     }
 
     /**

tests/TestCase/Database/Schema/MysqlSchemaTest.php

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

tests/TestCase/Database/Schema/PostgresSchemaTest.php

@@ -277,7 +277,6 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'biginteger',
-                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 20,
@@ -288,7 +287,6 @@ SQL;
             ],
             'title' => [
                 'type' => 'string',
-                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => 20,
@@ -298,7 +296,6 @@ SQL;
             ],
             'body' => [
                 'type' => 'text',
-                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -307,7 +304,6 @@ SQL;
             ],
             'author_id' => [
                 'type' => 'integer',
-                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 10,
@@ -318,7 +314,6 @@ SQL;
             ],
             'published' => [
                 'type' => 'boolean',
-                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => null,
@@ -327,7 +322,6 @@ SQL;
             ],
             'views' => [
                 'type' => 'integer',
-                'baseType' => null,
                 'null' => true,
                 'default' => 0,
                 'length' => 5,
@@ -338,7 +332,6 @@ SQL;
             ],
             'created' => [
                 'type' => 'timestamp',
-                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -394,7 +387,6 @@ SQL;
         $expected = [
             'id' => [
                 'type' => 'integer',
-                'baseType' => null,
                 'null' => false,
                 'default' => null,
                 'length' => 10,
@@ -405,7 +397,6 @@ SQL;
             ],
             'name' => [
                 'type' => 'string',
-                'baseType' => null,
                 'null' => true,
                 'default' => 'bob',
                 'length' => 50,
@@ -415,7 +406,6 @@ SQL;
             ],
             'bio' => [
                 'type' => 'date',
-                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,
@@ -424,7 +414,6 @@ SQL;
             ],
             'position' => [
                 'type' => 'integer',
-                'baseType' => null,
                 'null' => true,
                 'default' => '1',
                 'length' => 10,
@@ -435,7 +424,6 @@ SQL;
             ],
             'created' => [
                 'type' => 'timestamp',
-                'baseType' => null,
                 'null' => true,
                 'default' => null,
                 'length' => null,

tests/TestCase/Database/Schema/SqliteSchemaTest.php

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

tests/TestCase/Database/Schema/SqlserverSchemaTest.php

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

tests/TestCase/Database/Schema/TableTest.php

@@ -205,7 +205,6 @@ class TableTest extends TestCase
         $result = $table->column('title');
         $expected = [
             'type' => 'string',
-            'baseType' => null,
             'length' => null,
             'precision' => null,
             'default' => null,
@@ -221,7 +220,6 @@ class TableTest extends TestCase
         $result = $table->column('author_id');
         $expected = [
             'type' => 'integer',
-            'baseType' => null,
             'length' => null,
             'precision' => null,
             'default' => null,
@@ -238,7 +236,6 @@ class TableTest extends TestCase
         $result = $table->column('amount');
         $expected = [
             'type' => 'decimal',
-            'baseType' => null,
             'length' => null,
             'precision' => null,
             'default' => null,