Synchronizing Doctrine 1 SVN with git

doctrine · Jun 8, 2010 · 918a87d · 918a87d
1 parent b9a297f
commit 918a87d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/lib/Doctrine/Export.php b/lib/Doctrine/Export.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Export.php 7490 2010-03-29 19:53:27Z jwage $
+ *  $Id: Export.php 7653 2010-06-08 15:54:31Z jwage $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -29,7 +29,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7490 $
+ * @version     $Revision: 7653 $
  */
 class Doctrine_Export extends Doctrine_Connection_Module
 {
@@ -148,7 +148,7 @@ public function dropConstraint($table, $name, $primary = false)
      */
     public function dropForeignKey($table, $name)
     {
-        return $this->dropConstraint($table, $name);
+        return $this->dropConstraint($table, $this->conn->formatter->getForeignKeyName($name));
     }
 
     /**
@@ -1386,4 +1386,4 @@ public function exportTable(Doctrine_Table $table)
             }
         }
     }
-}
+}
diff --git a/lib/Doctrine/Export/Mysql.php b/lib/Doctrine/Export/Mysql.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Mysql.php 7647 2010-06-08 15:26:00Z jwage $
+ *  $Id: Mysql.php 7653 2010-06-08 15:54:31Z jwage $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -29,7 +29,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7647 $
+ * @version     $Revision: 7653 $
  */
 class Doctrine_Export_Mysql extends Doctrine_Export
 {
@@ -812,8 +812,8 @@ public function dropTableSql($table)
     public function dropForeignKey($table, $name)
     {
         $table = $this->conn->quoteIdentifier($table);
-        $name  = $this->conn->quoteIdentifier($name);
+        $name  = $this->conn->quoteIdentifier($this->conn->formatter->getForeignKeyName($name));
 
         return $this->conn->exec('ALTER TABLE ' . $table . ' DROP FOREIGN KEY ' . $name);
     }
-}
+}
diff --git a/tests/ExportTestCase.php b/tests/ExportTestCase.php
@@ -85,4 +85,12 @@ public function testExport()
     {
 
     }
+    public function testDropDottedForeignKey()
+    {
+        $this->export->dropForeignKey('sometable', 'normal_foreign_key');
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE sometable DROP CONSTRAINT normal_foreign_key');
+
+        $this->export->dropForeignKey('sometable', 'dotted.foreign.key');
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE sometable DROP CONSTRAINT dotted_foreign_key');
+    }
 }