Commit e42bb0e5 authored by zYne's avatar zYne

--no commit message

--no commit message
parent 84eaea70
...@@ -822,7 +822,7 @@ class Doctrine_Export extends Doctrine_Connection_Module ...@@ -822,7 +822,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
try { try {
$data = $table->getExportableFormat(); $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) { } catch(Doctrine_Connection_Exception $e) {
// we only want to silence table already exists errors // we only want to silence table already exists errors
if($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) { if($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) {
......
...@@ -366,7 +366,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -366,7 +366,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$options['primary'] = $primary; $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 * exportConstraints
......
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