diff --git a/lib/Doctrine/Export.php b/lib/Doctrine/Export.php index a7083fa0f..cc7478474 100644 --- a/lib/Doctrine/Export.php +++ b/lib/Doctrine/Export.php @@ -454,7 +454,7 @@ class Doctrine_Export extends Doctrine_Connection_Module { $table = $this->conn->quoteIdentifier($table); - $query = 'ALTER TABLE ' . $table . ' ADD CONSTRAINT ' . $this->getForeignKeyDeclaration($definition); + $query = 'ALTER TABLE ' . $table . ' ADD ' . $this->getForeignKeyDeclaration($definition); return $query; } @@ -908,7 +908,7 @@ class Doctrine_Export extends Doctrine_Connection_Module { $sql = ''; if (isset($definition['name'])) { - $sql .= ' ' . $this->conn->quoteIdentifier($definition['name']) . ' '; + $sql .= ' CONSTRAINT ' . $this->conn->quoteIdentifier($definition['name']) . ' '; } $sql .= 'FOREIGN KEY ('; diff --git a/lib/Doctrine/Export/Pgsql.php b/lib/Doctrine/Export/Pgsql.php index 89ff3fd60..6d4cd89c8 100644 --- a/lib/Doctrine/Export/Pgsql.php +++ b/lib/Doctrine/Export/Pgsql.php @@ -331,20 +331,5 @@ class Doctrine_Export_Pgsql extends Doctrine_Export return $sql; } - - /** - * createForeignKeySql - * - * @param string $table name of the table on which the foreign key is to be created - * @param array $definition associative array that defines properties of the foreign key to be created. - * @return string - */ - public function createForeignKeySql($table, array $definition) - { - $table = $this->conn->quoteIdentifier($table); - $query = 'ALTER TABLE ' . $table . ' ADD ' . $this->getForeignKeyDeclaration($definition); - - return $query; - } } \ No newline at end of file