Merge branch '2.2'

lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php

@@ -764,7 +764,7 @@ class MsSqlPlatform extends AbstractPlatform
             'nvarchar' => 'string',
             'ntext' => 'text',
             'binary' => 'text',
-            'varbinary' => 'text',
+            'varbinary' => 'blob',
             'image' => 'text',
         );
     }

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -679,6 +679,10 @@ class MySqlPlatform extends AbstractPlatform
             'decimal'       => 'decimal',
             'numeric'       => 'decimal',
             'year'          => 'date',
+            'longblob'      => 'blob',
+            'blob'          => 'blob',
+            'mediumblob'    => 'blob',
+            'tinyblob'      => 'blob',
         );
     }
 

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -811,6 +811,7 @@ LEFT JOIN all_cons_columns r_cols
             'long raw'          => 'text',
             'rowid'             => 'string',
             'urowid'            => 'string',
+            'blob'              => 'blob',
         );
     }
 

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -767,6 +767,7 @@ class PostgreSqlPlatform extends AbstractPlatform
             'money'         => 'decimal',
             'numeric'       => 'decimal',
             'year'          => 'date',
+            'bytea'         => 'blob',
         );
     }
 

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

@@ -479,6 +479,7 @@ class SqlitePlatform extends AbstractPlatform
             'real'             => 'float',
             'decimal'          => 'decimal',
             'numeric'          => 'decimal',
+            'blob'             => 'blob',
         );
     }
 

lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php

@@ -276,9 +276,8 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
         $precision = null;
         $scale = null;
 
-        if ($this->_platform->hasDoctrineTypeMappingFor($tableColumn['type'])) {
-            $dbType = strtolower($tableColumn['type']);
-        } else {
+        $dbType = strtolower($tableColumn['type']);
+        if (strlen($tableColumn['domain_type'])) {
             $dbType = strtolower($tableColumn['domain_type']);
             $tableColumn['complete_type'] = $tableColumn['domain_complete_type'];
         }

doctrine-build-common @ efa94de2

-Subproject commit 5719f632cab682f611e18b6d83ef83841911a1ef
+Subproject commit efa94de25beef4aefaeb7972c122798f9876fc39

doctrine-common @ 17e77400

-Subproject commit d599286518ef739afed05b4f29760ac44d275233
+Subproject commit 17e774007b98beb2e253e645260e0f9c32f4c936

tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -547,6 +547,20 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->assertInstanceOf('Doctrine\DBAL\Types\ArrayType', $columns['arr']->getType(), "The Doctrine2 should be detected from comment hint.");
     }
 
+    /**
+     * @group DBAL-197
+     */
+    public function testListTableWithBlob()
+    {
+        $table = new \Doctrine\DBAL\Schema\Table('test_blob_table');
+        $table->addColumn('id', 'integer', array('comment' => 'This is a comment'));
+        $table->addColumn('binarydata', 'blob', array());
+        $table->setPrimaryKey(array('id'));
+
+        $this->_sm->createTable($table);
+        $blobTable = $this->_sm->listTableDetails('test_blob_table');
+    }
+
     /**
      * @param string $name
      * @param array $data