diff --git a/lib/Doctrine/Export.php b/lib/Doctrine/Export.php index 0c80a0671..4746ba636 100644 --- a/lib/Doctrine/Export.php +++ b/lib/Doctrine/Export.php @@ -205,7 +205,7 @@ class Doctrine_Export extends Doctrine_Connection_Module * * @return string */ - public function createTableSql($name, array $fields, array $options = array(), $exportForeignKeySql = true) + public function createTableSql($name, array $fields, array $options = array()) { if ( ! $name) { throw new Doctrine_Export_Exception('no valid table name specified'); @@ -242,7 +242,7 @@ class Doctrine_Export extends Doctrine_Connection_Module $sql[] = $query; - if (isset($options['foreignKeys']) && $exportForeignKeySql) { + if (isset($options['foreignKeys'])) { foreach ((array) $options['foreignKeys'] as $k => $definition) { if (is_array($definition)) { @@ -1047,9 +1047,8 @@ class Doctrine_Export extends Doctrine_Connection_Module $record = new $name(); $table = $record->getTable(); $data = $table->getExportableFormat(); - $exportForeignKeySql = is_bool($table->getOption('export_foreign_key_sql')) ? $table->getOption('export_foreign_key_sql'):true; - $query = $this->conn->export->createTableSql($data['tableName'], $data['columns'], $data['options'], $exportForeignKeySql); + $query = $this->conn->export->createTableSql($data['tableName'], $data['columns'], $data['options']); if (is_array($query)) { $sql = array_merge($sql, $query); diff --git a/lib/Doctrine/Export/Mysql.php b/lib/Doctrine/Export/Mysql.php index ea5ff6237..cbee9ac4f 100644 --- a/lib/Doctrine/Export/Mysql.php +++ b/lib/Doctrine/Export/Mysql.php @@ -87,7 +87,7 @@ class Doctrine_Export_Mysql extends Doctrine_Export * * @return void */ - public function createTableSql($name, array $fields, array $options = array(), $exportForeignKeySql = true) + public function createTableSql($name, array $fields, array $options = array()) { if ( ! $name) throw new Doctrine_Export_Exception('no valid table name specified'); @@ -169,7 +169,7 @@ class Doctrine_Export_Mysql extends Doctrine_Export } $sql[] = $query; - if (isset($options['foreignKeys']) && $exportForeignKeySql) { + if (isset($options['foreignKeys'])) { foreach ((array) $options['foreignKeys'] as $k => $definition) { if (is_array($definition)) { diff --git a/lib/Doctrine/Export/Oracle.php b/lib/Doctrine/Export/Oracle.php index 41ce89d19..8b596484c 100644 --- a/lib/Doctrine/Export/Oracle.php +++ b/lib/Doctrine/Export/Oracle.php @@ -283,9 +283,9 @@ END; * * @return void */ - public function createTableSql($name, array $fields, array $options = array(), $exportForeignKeySql = true) + public function createTableSql($name, array $fields, array $options = array()) { - $sql = parent::createTableSql($name, $fields, $options, $exportForeignKeySql); + $sql = parent::createTableSql($name, $fields, $options); foreach ($fields as $fieldName => $field) { if (isset($field['autoincrement']) && $field['autoincrement'] || diff --git a/lib/Doctrine/Export/Pgsql.php b/lib/Doctrine/Export/Pgsql.php index 745474a78..befdae1e1 100644 --- a/lib/Doctrine/Export/Pgsql.php +++ b/lib/Doctrine/Export/Pgsql.php @@ -291,7 +291,7 @@ class Doctrine_Export_Pgsql extends Doctrine_Export * @param array $options * @return unknown */ - public function createTableSql($name, array $fields, array $options = array(), $exportForeignKeySql = true) + public function createTableSql($name, array $fields, array $options = array()) { if ( ! $name) { throw new Doctrine_Export_Exception('no valid table name specified'); @@ -318,7 +318,7 @@ class Doctrine_Export_Pgsql extends Doctrine_Export } } - if (isset($options['foreignKeys']) && $exportForeignKeySql) { + if (isset($options['foreignKeys'])) { foreach ((array) $options['foreignKeys'] as $k => $definition) { if (is_array($definition)) { diff --git a/lib/Doctrine/Export/Sqlite.php b/lib/Doctrine/Export/Sqlite.php index c02c95b25..dedeab085 100644 --- a/lib/Doctrine/Export/Sqlite.php +++ b/lib/Doctrine/Export/Sqlite.php @@ -155,7 +155,7 @@ class Doctrine_Export_Sqlite extends Doctrine_Export * * @return void */ - public function createTableSql($name, array $fields, array $options = array(), $exportForeignKeySql = true) + public function createTableSql($name, array $fields, array $options = array()) { if ( ! $name) { throw new Doctrine_Export_Exception('no valid table name specified');