This commit is contained in:
parent
84eaea70d1
commit
e42bb0e506
@ -822,7 +822,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
|
||||
try {
|
||||
$data = $table->getExportableFormat();
|
||||
|
||||
$this->conn->export->createTable($data[0], $data[1], $data[2]);
|
||||
$this->conn->export->createTable($data['tableName'], $data['columns'], $data['options']);
|
||||
} catch(Doctrine_Connection_Exception $e) {
|
||||
// we only want to silence table already exists errors
|
||||
if($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) {
|
||||
|
@ -366,7 +366,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
|
||||
|
||||
$options['primary'] = $primary;
|
||||
|
||||
return array($this->getOption('tableName'), $columns, array_merge($this->getOptions(), $options));
|
||||
return array('tableName' => $this->getOption('tableName'),
|
||||
'columns' => $columns,
|
||||
'options' => array_merge($this->getOptions(), $options));
|
||||
}
|
||||
/**
|
||||
* exportConstraints
|
||||
|
Loading…
x
Reference in New Issue
Block a user