Skip to content

D
doctrine-dbal
Commit 8faf31e3 authored by zYne's avatar zYne
Browse files
Options

--no commit message 

--no commit message
parent b8c2005b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
lib/Doctrine/Export.php
View file @ 8faf31e3
......@@ -223,10 +223,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
foreach ((array) $options['foreignKeys'] as $k => $definition) {
if (is_array($definition)) {
if ( ! isset($definition['table'])) {
$definition['table'] = $name;
}
$sql[] = $this->createForeignKeySql($definition['table'], $definition);
$sql[] = $this->createForeignKeySql($name, $definition);
}
}
}
......@@ -868,6 +865,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
if ( ! is_array($definition['foreign'])) {
$definition['foreign'] = array($definition['foreign']);
}
$sql .= implode(', ', array_map(array($this->conn, 'quoteIdentifier'), $definition['local']))
. ') REFERENCES '
. $definition['foreignTable'] . '('
......@@ -1007,7 +1005,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
} else {
$sql[] = $query;
}
if (isset($data['options']['foreignKeys']) && is_array($data['options']['foreignKeys'])) {
$fks[$table->getTableName()] = $data['options']['foreignKeys'];
}
......
lib/Doctrine/Export/Mysql.php
View file @ 8faf31e3
......@@ -166,10 +166,7 @@ class Doctrine_Export_Mysql extends Doctrine_Export
foreach ((array) $options['foreignKeys'] as $k => $definition) {
if (is_array($definition)) {
if ( ! isset($definition['table'])) {
$definition['table'] = $name;
}
$sql[] = $this->createForeignKeySql($definition['table'], $definition);
$sql[] = $this->createForeignKeySql($name, $definition);
}
}
}
......
lib/Doctrine/Table.php
View file @ 8faf31e3
......@@ -382,9 +382,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$relation->hasConstraint()) {
$def = array('local' => $relation->getLocal(),
'table' => $relation->getTable()->getTableName(),
'foreign' => $this->getIdentifier(),
'foreignTable' => $this->getTableName());
'foreignTable' => $relation->getTable()->getTableName());
if (($key = array_search($def, $options['foreignKeys'])) === false) {
$options['foreignKeys'][] = $def;
......@@ -402,9 +401,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$relation->getForeign() !== $relation->getTable()->getIdentifier()) {
$def = array('local' => $relation->getLocal(),
'table' => $relation->getTable()->getTableName(),
'foreign' => $this->getIdentifier(),
'foreignTable' => $this->getTableName());
'foreignTable' => $relation->getTable()->getTableName());
if (($key = array_search($def, $options['foreignKeys'])) === false) {
$options['foreignKeys'][] = $def;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment