DDC-1151 - Fix missing table quotes when adding foreign keys in Schem…

…aTool
Seldaek · May 14, 2011 · 60e7b8e · 60e7b8e
1 parent 75e42f8
commit 60e7b8e
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -185,7 +185,7 @@ public function getSchemaFromMetadata(array $classes)
 
                     // Add a FK constraint on the ID column
                     $table->addUnnamedForeignKeyConstraint(
-                        $this->_em->getClassMetadata($class->rootEntityName)->getTableName(),
+                        $this->_em->getClassMetadata($class->rootEntityName)->getQuotedTableName($this->_platform),
                         array($columnName), array($columnName), array('onDelete' => 'CASCADE')
                     );
                 }
@@ -424,6 +424,7 @@ private function _gatherRelationJoinColumns($joinColumns, $theJoinTable, $class,
         $localColumns = array();
         $foreignColumns = array();
         $fkOptions = array();
+        $foreignTableName = $class->getQuotedTableName($this->_platform);
 
         foreach ($joinColumns as $joinColumn) {
             $columnName = $joinColumn['name'];

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1151
+ */
+class DDC1151Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{    
+    public function testQuoteForeignKey()
+    {
+        if ($this->_em->getConnection()->getDatabasePlatform()->getName() != 'postgresql') {
+            $this->markTestSkipped("This test is useful for all databases, but designed only for postgresql.");
+        }
+
+        $sql = $this->_schemaTool->getCreateSchemaSql(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151User'),
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151Group'),
+        ));
+
+        $this->assertEquals("CREATE TABLE \"User\" (id INT NOT NULL, PRIMARY KEY(id))", $sql[0]);
+        $this->assertEquals("CREATE TABLE ddc1151user_ddc1151group (ddc1151user_id INT NOT NULL, ddc1151group_id INT NOT NULL, PRIMARY KEY(ddc1151user_id, ddc1151group_id))", $sql[1]);
+        $this->assertEquals("CREATE INDEX IDX_88A3259AC5AD08A ON ddc1151user_ddc1151group (ddc1151user_id)", $sql[2]);
+        $this->assertEquals("CREATE INDEX IDX_88A32597357E0B1 ON ddc1151user_ddc1151group (ddc1151group_id)", $sql[3]);
+        $this->assertEquals("CREATE TABLE \"Group\" (id INT NOT NULL, PRIMARY KEY(id))", $sql[4]);
+        $this->assertEquals("CREATE SEQUENCE User_id_seq INCREMENT BY 1 MINVALUE 1 START 1", $sql[5]);
+        $this->assertEquals("CREATE SEQUENCE Group_id_seq INCREMENT BY 1 MINVALUE 1 START 1", $sql[6]);
+        $this->assertEquals("ALTER TABLE ddc1151user_ddc1151group ADD FOREIGN KEY (ddc1151user_id) REFERENCES \"User\"(id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE", $sql[7]);
+        $this->assertEquals("ALTER TABLE ddc1151user_ddc1151group ADD FOREIGN KEY (ddc1151group_id) REFERENCES \"Group\"(id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE", $sql[8]);
+    }
+}
+
+/**
+ * @Entity
+ * @Table(name="`User`")
+ */
+class DDC1151User
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @ManyToMany(targetEntity="DDC1151Group") */
+    public $groups;
+}
+
+/**
+ * @Entity
+ * @Table(name="`Group`")
+ */
+class DDC1151Group
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+}