Merge branch 'DBAL-168' into 2.1.x

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -210,8 +210,7 @@ class PostgreSqlPlatform extends AbstractPlatform
                   (
                       SELECT c.oid
                       FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n
-                      WHERE " .$this->getTableWhereClause($table) ."
-                        AND n.oid = c.relnamespace
+                      WHERE " .$this->getTableWhereClause($table) ." AND n.oid = c.relnamespace
                   )
                   AND r.contype = 'f'";
     }
@@ -259,15 +258,22 @@ class PostgreSqlPlatform extends AbstractPlatform
                  ) AND pg_index.indexrelid = oid";
     }
 
+    /**
+     * @param string $table
+     * @param string $classAlias
+     * @param string $namespaceAlias
+     * @return string
+     */
     private function getTableWhereClause($table, $classAlias = 'c', $namespaceAlias = 'n')
     {
-        $whereClause = "";
+        $whereClause = $namespaceAlias.".nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast') AND ";
         if (strpos($table, ".") !== false) {
             list($schema, $table) = explode(".", $table);
-            $whereClause = "$classAlias.relname = '" . $table . "' AND $namespaceAlias.nspname = '" . $schema . "'";
+            $whereClause .= "$classAlias.relname = '" . $table . "' AND $namespaceAlias.nspname = '" . $schema . "'";
         } else {
-            $whereClause = "$classAlias.relname = '" . $table . "'";
+            $whereClause .= "$classAlias.relname = '" . $table . "'";
         }
+
         return $whereClause;
     }
 

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

@@ -39,9 +39,9 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
 
         $sequence = new \Doctrine\DBAL\Schema\Sequence('list_sequences_test_seq', 20, 10);
         $this->_sm->createSequence($sequence);
-        
+
         $sequences = $this->_sm->listSequences();
-        
+
         $this->assertInternalType('array', $sequences, 'listSequences() should return an array.');
 
         $foundSequence = null;
@@ -67,7 +67,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $databases = $this->_sm->listDatabases();
 
         $databases = \array_map('strtolower', $databases);
-        
+
         $this->assertEquals(true, \in_array('test_create_database', $databases));
     }
 
@@ -163,7 +163,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->assertEquals(true,   $columns['baz2']->getnotnull());
         $this->assertEquals(null,   $columns['baz2']->getdefault());
         $this->assertInternalType('array',  $columns['baz2']->getPlatformOptions());
-        
+
         $this->assertEquals('baz3', strtolower($columns['baz3']->getname()));
         $this->assertContains($columns['baz2']->gettype()->getName(), array('time', 'date', 'datetime'));
         $this->assertEquals(true,   $columns['baz3']->getnotnull());
@@ -250,7 +250,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->assertEquals(1, count($fkConstraints), "Table 'test_create_fk1' has to have one foreign key.");
 
         $fkConstraint = current($fkConstraints);
-        $this->assertType('\Doctrine\DBAL\Schema\ForeignKeyConstraint', $fkConstraint);
+        $this->assertInstanceOf('\Doctrine\DBAL\Schema\ForeignKeyConstraint', $fkConstraint);
         $this->assertEquals('test_foreign',             strtolower($fkConstraint->getForeignTableName()));
         $this->assertEquals(array('foreign_key_test'),  array_map('strtolower', $fkConstraint->getColumns()));
         $this->assertEquals(array('id'),                array_map('strtolower', $fkConstraint->getForeignColumns()));
@@ -276,7 +276,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $fkeys = $this->_sm->listTableForeignKeys('test_create_fk1');
 
         $this->assertEquals(1, count($fkeys), "Table 'test_create_fk1' has to have one foreign key.");
-        
+
         $this->assertInstanceOf('Doctrine\DBAL\Schema\ForeignKeyConstraint', $fkeys[0]);
         $this->assertEquals(array('foreign_key_test'),  array_map('strtolower', $fkeys[0]->getLocalColumns()));
         $this->assertEquals(array('id'),                array_map('strtolower', $fkeys[0]->getForeignColumns()));
@@ -399,7 +399,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->assertTrue($inferredTable->hasColumn('id'));
         $this->assertTrue($inferredTable->getColumn('id')->getAutoincrement());
     }
-    
+
     /**
      * @group DDC-887
      */
@@ -408,11 +408,11 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         if (!$this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) {
             $this->markTestSkipped('This test is only supported on platforms that have foreign keys.');
         }
-        
+
         $table = new \Doctrine\DBAL\Schema\Table('test_fk_base');
         $table->addColumn('id', 'integer');
         $table->setPrimaryKey(array('id'));
-        
+
         $tableFK = new \Doctrine\DBAL\Schema\Table('test_fk_rename');
         $tableFK->setSchemaConfig($this->_sm->createSchemaConfig());
         $tableFK->addColumn('id', 'integer');
@@ -420,10 +420,10 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $tableFK->setPrimaryKey(array('id'));
         $tableFK->addIndex(array('fk_id'), 'fk_idx');
         $tableFK->addForeignKeyConstraint('test_fk_base', array('fk_id'), array('id'));
-        
+
         $this->_sm->createTable($table);
         $this->_sm->createTable($tableFK);
-        
+
         $tableFKNew = new \Doctrine\DBAL\Schema\Table('test_fk_rename');
         $tableFKNew->setSchemaConfig($this->_sm->createSchemaConfig());
         $tableFKNew->addColumn('id', 'integer');
@@ -431,10 +431,10 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $tableFKNew->setPrimaryKey(array('id'));
         $tableFKNew->addIndex(array('rename_fk_id'), 'fk_idx');
         $tableFKNew->addForeignKeyConstraint('test_fk_base', array('rename_fk_id'), array('id'));
-        
+
         $c = new \Doctrine\DBAL\Schema\Comparator();
         $tableDiff = $c->diffTable($tableFK, $tableFKNew);
-        
+
         $this->_sm->alterTable($tableDiff);
     }
 

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

@@ -5,13 +5,13 @@ namespace Doctrine\Tests\DBAL\Functional\Schema;
 use Doctrine\DBAL\Schema;
 
 require_once __DIR__ . '/../../../TestInit.php';
- 
+
 class SqliteSchemaManagerTest extends SchemaManagerFunctionalTestCase
 {
     /**
      * SQLITE does not support databases.
-     * 
-     * @expectedException \Exception
+     *
+     * @expectedException Doctrine\DBAL\DBALException
      */
     public function testListDatabases()
     {
@@ -29,29 +29,7 @@ class SqliteSchemaManagerTest extends SchemaManagerFunctionalTestCase
     }
 
     /**
-     * @expectedException \Exception
-     */
-    // This test is not correct. createSequence expects an object.
-    // PHPUnit wrapping the PHP error in an exception hides this but it shows up
-    // when the tests are run in the build (phing).
-    /*public function testCreateSequence()
-    {
-        $this->_sm->createSequence('seqname', 1, 1);
-    }*/
-
-    /**
-     * @expectedException \Exception
-     */
-    // This test is not correct. createForeignKey expects an object.
-    // PHPUnit wrapping the PHP error in an exception hides this but it shows up
-    // when the tests are run in the build (phing).
-    /*public function testCreateForeignKey()
-    {
-        $this->_sm->createForeignKey('table', array());
-    }*/
-
-    /**
-     * @expectedException \Exception
+     * @expectedException Doctrine\DBAL\DBALException
      */
     public function testRenameTable()
     {

tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL168Test.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Functional\Ticket;
+
+/**
+ * @group DBAL-168
+ */
+class DBAL168Test extends \Doctrine\Tests\DbalFunctionalTestCase
+{
+    public function testDomainsTable()
+    {
+        if ($this->_conn->getDatabasePlatform()->getName() != "postgresql") {
+            $this->markTestSkipped('PostgreSQL only test');
+        }
+
+        $table = new \Doctrine\DBAL\Schema\Table("domains");
+        $table->addColumn('id', 'integer');
+        $table->addColumn('parent_id', 'integer');
+        $table->setPrimaryKey(array('id'));
+        $table->addForeignKeyConstraint('domains', array('parent_id'), array('id'));
+
+        $this->_conn->getSchemaManager()->createTable($table);
+        $table = $this->_conn->getSchemaManager()->listTableDetails('domains');
+
+        $this->assertEquals('domains', $table->getName());
+    }
+}
\ No newline at end of file

tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php

@@ -81,7 +81,11 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
         $sql = "SELECT " . $columnName . " FROM type_conversion WHERE id = " . self::$typeCounter;
         $actualDbValue = $typeInstance->convertToPHPValue($this->_conn->fetchColumn($sql), $this->_conn->getDatabasePlatform());
 
-        $this->assertType($expectedPhpType, $actualDbValue, "The expected type from the conversion to and back from the database should be " . $expectedPhpType);
+        if ($originalValue instanceof \DateTime) {
+            $this->assertInstanceOf($expectedPhpType, $actualDbValue, "The expected type from the conversion to and back from the database should be " . $expectedPhpType);
+        } else {
+            $this->assertInternalType($expectedPhpType, $actualDbValue, "The expected type from the conversion to and back from the database should be " . $expectedPhpType);
+        }
 
         if ($type !== "datetimetz") {
             $this->assertEquals($originalValue, $actualDbValue, "Conversion between values should produce the same out as in value, but doesnt!");

tests/Doctrine/Tests/DBAL/Platforms/MsSqlPlatformTest.php

@@ -156,7 +156,7 @@ class MsSqlPlatformTest extends AbstractPlatformTestCase
     public function testModifyLimitQueryWithOffset()
     {
         $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user ORDER BY username DESC', 10, 5);
-        $this->assertEquals('WITH outer_tbl AS (SELECT ROW_NUMBER() OVER (ORDER BY username DESC) AS "doctrine_rownum", * FROM (SELECT * FROM user) AS inner_tbl) SELECT * FROM outer_tbl WHERE "doctrine_rownum" BETWEEN 6 AND 15', $sql);
+        $this->assertEquals('SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY username DESC) AS "doctrine_rownum", * FROM user) AS doctrine_tbl WHERE "doctrine_rownum" BETWEEN 6 AND 15', $sql);
     }
 
     public function testModifyLimitQueryWithAscOrderBy()

tests/Doctrine/Tests/DBAL/Types/DateTimeTest.php

@@ -6,7 +6,7 @@ use Doctrine\DBAL\Types\Type;
 use Doctrine\Tests\DBAL\Mocks;
 
 require_once __DIR__ . '/../../TestInit.php';
- 
+
 class DateTimeTest extends \Doctrine\Tests\DbalTestCase
 {
     protected
@@ -24,7 +24,7 @@ class DateTimeTest extends \Doctrine\Tests\DbalTestCase
         $date = new \DateTime('1985-09-01 10:10:10');
 
         $expected = $date->format($this->_platform->getDateTimeTzFormatString());
-        $actual = is_string($this->_type->convertToDatabaseValue($date, $this->_platform));
+        $actual = $this->_type->convertToDatabaseValue($date, $this->_platform);
 
         $this->assertEquals($expected, $actual);
     }

tests/Doctrine/Tests/DBAL/Types/DateTimeTzTest.php

@@ -24,7 +24,7 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
         $date = new \DateTime('1985-09-01 10:10:10');
 
         $expected = $date->format($this->_platform->getDateTimeTzFormatString());
-        $actual = is_string($this->_type->convertToDatabaseValue($date, $this->_platform));
+        $actual = $this->_type->convertToDatabaseValue($date, $this->_platform);
 
         $this->assertEquals($expected, $actual);
     }
@@ -36,7 +36,7 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
         $this->assertInstanceOf('DateTime', $date);
         $this->assertEquals('1985-09-01 00:00:00', $date->format('Y-m-d H:i:s'));
     }
-    
+
     public function testInvalidDateFormatConversion()
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');

tests/Doctrine/Tests/DBAL/Types/VarDateTimeTest.php

@@ -27,7 +27,7 @@ class VarDateTimeTest extends \Doctrine\Tests\DbalTestCase
         $date = new \DateTime('1985-09-01 10:10:10');
 
         $expected = $date->format($this->_platform->getDateTimeTzFormatString());
-        $actual = is_string($this->_type->convertToDatabaseValue($date, $this->_platform));
+        $actual = $this->_type->convertToDatabaseValue($date, $this->_platform);
 
         $this->assertEquals($expected, $actual);
     }