DBAL-21 - Fallback for Domain Types to underyling db types when matching...

DBAL-21 - Fallback for Domain Types to underyling db types when matching against Doctrine Mapping typesin Postgres Platform/SchemaManager

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -125,6 +125,22 @@ abstract class AbstractPlatform
         }
     }
 
+    /**
+     * Check if a database type is currently supported by this platform.
+     *
+     * @param string $dbType
+     * @return bool
+     */
+    public function hasDoctrineTypeMappingFor($dbType)
+    {
+        if ($this->doctrineTypeMapping === null) {
+            $this->initializeDoctrineTypeMappings();
+        }
+
+        $dbType = strtolower($dbType);
+        return isset($this->doctrineTypeMapping[$dbType]);
+    }
+
     /**
      * Lazy load Doctrine Type Mappings
      *

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -249,6 +249,9 @@ class PostgreSqlPlatform extends AbstractPlatform
                     a.attname AS field,
                     t.typname AS type,
                     format_type(a.atttypid, a.atttypmod) AS complete_type,
+                    (SELECT t1.typname FROM pg_catalog.pg_type t1 WHERE t1.oid = t.typbasetype) AS domain_type,
+                    (SELECT format_type(t2.typbasetype, t2.typtypmod) FROM pg_catalog.pg_type t2
+                     WHERE t2.typtype = 'd' AND t2.typname = format_type(a.atttypid, a.atttypmod)) AS domain_complete_type,
                     a.attnotnull AS isnotnull,
                     (SELECT 't'
                      FROM pg_index

lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php

 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -31,19 +32,20 @@ namespace Doctrine\DBAL\Schema;
  */
 class PostgreSqlSchemaManager extends AbstractSchemaManager
 {
+
     protected function _getPortableTableForeignKeyDefinition($tableForeignKey)
     {
         $onUpdate = null;
         $onDelete = null;
 
-        if(preg_match('(ON UPDATE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
+        if (preg_match('(ON UPDATE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
             $onUpdate = $match[1];
         }
-        if(preg_match('(ON DELETE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
+        if (preg_match('(ON DELETE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
             $onDelete = $match[1];
         }
 
-        if(preg_match('/FOREIGN KEY \((.+)\) REFERENCES (.+)\((.+)\)/', $tableForeignKey['condef'], $values)) {
+        if (preg_match('/FOREIGN KEY \((.+)\) REFERENCES (.+)\((.+)\)/', $tableForeignKey['condef'], $values)) {
             $localColumns = explode(",", $values[1]);
             $foreignColumns = explode(",", $values[3]);
             $foreignTable = $values[2];
@@ -120,9 +122,9 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
     protected function _getPortableTableIndexesList($tableIndexes, $tableName=null)
     {
         $buffer = array();
-        foreach($tableIndexes AS $row) {
-            $colNumbers = explode( ' ', $row['indkey'] );
-            $colNumbersSql = 'IN (' . join( ' ,', $colNumbers ) . ' )';
+        foreach ($tableIndexes AS $row) {
+            $colNumbers = explode(' ', $row['indkey']);
+            $colNumbersSql = 'IN (' . join(' ,', $colNumbers) . ' )';
             $columnNameSql = "SELECT attnum, attname FROM pg_attribute
                 WHERE attrelid={$row['indrelid']} AND attnum $colNumbersSql ORDER BY attnum ASC;";
 
@@ -131,7 +133,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
 
             // required for getting the order of the columns right.
             foreach ($colNumbers AS $colNum) {
-                foreach ( $indexColumns as $colRow ) {
+                foreach ($indexColumns as $colRow) {
                     if ($colNum == $colRow['attnum']) {
                         $buffer[] = array(
                             'key_name' => $row['relname'],
@@ -153,7 +155,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
 
     protected function _getPortableSequenceDefinition($sequence)
     {
-        $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM '.$sequence['relname']);
+        $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $sequence['relname']);
         return new Sequence($sequence['relname'], $data[0]['increment_by'], $data[0]['min_value']);
     }
 
@@ -184,20 +186,25 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
         if ($length == '-1' && isset($tableColumn['atttypmod'])) {
             $length = $tableColumn['atttypmod'] - 4;
         }
-        if ((int)$length <= 0) {
+        if ((int) $length <= 0) {
             $length = null;
         }
         $type = array();
         $fixed = null;
 
-        if ( ! isset($tableColumn['name'])) {
+        if (!isset($tableColumn['name'])) {
             $tableColumn['name'] = '';
         }
 
         $precision = null;
         $scale = null;
 
+        if ($this->_platform->hasDoctrineTypeMappingFor($tableColumn['type'])) {
             $dbType = strtolower($tableColumn['type']);
+        } else {
+            $dbType = strtolower($tableColumn['domain_type']);
+            $tableColumn['complete_type'] = $tableColumn['domain_complete_type'];
+        }
 
         $type = $this->_platform->getDoctrineTypeMapping($dbType);
         switch ($dbType) {
@@ -239,7 +246,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
             case 'decimal':
             case 'money':
             case 'numeric':
-                if(preg_match('([A-Za-z]+\(([0-9]+)\,([0-9]+)\))', $tableColumn['complete_type'], $match)) {
+                if (preg_match('([A-Za-z]+\(([0-9]+)\,([0-9]+)\))', $tableColumn['complete_type'], $match)) {
                     $precision = $match[1];
                     $scale = $match[2];
                     $length = null;
@@ -264,4 +271,5 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
 
         return new Column($tableColumn['field'], \Doctrine\DBAL\Types\Type::getType($type), $options);
     }
+
 }
\ No newline at end of file

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

@@ -3,10 +3,46 @@
 namespace Doctrine\Tests\DBAL\Functional\Schema;
 
 use Doctrine\DBAL\Schema;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 require_once __DIR__ . '/../../../TestInit.php';
  
 class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
 {
+    /**
+     * @group DBAL-21
+     */
+    public function testSupportDomainTypeFallback()
+    {
+        $createDomainTypeSQL = "CREATE DOMAIN MyMoney AS DECIMAL(18,2)";
+        $this->_conn->exec($createDomainTypeSQL);
+
+        $createTableSQL = "CREATE TABLE domain_type_test (id INT PRIMARY KEY, value MyMoney)";
+        $this->_conn->exec($createTableSQL);
+
+        $table = $this->_conn->getSchemaManager()->listTableDetails('domain_type_test');
+        $this->assertType('Doctrine\DBAL\Types\DecimalType', $table->getColumn('value')->getType());
+
+        Type::addType('MyMoney', 'Doctrine\Tests\DBAL\Functional\Schema\MoneyType');
+        $this->_conn->getDatabasePlatform()->registerDoctrineTypeMapping('MyMoney', 'MyMoney');
+
+        $table = $this->_conn->getSchemaManager()->listTableDetails('domain_type_test');
+        $this->assertType('Doctrine\Tests\DBAL\Functional\Schema\MoneyType', $table->getColumn('value')->getType());
+    }
+}
+
+class MoneyType extends Type
+{
+
+    public function getName()
+    {
+        return "MyMoney";
+    }
+
+    public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    {
+        return 'MyMoney';
+    }
 
 }
\ No newline at end of file