From 3b0f749a58f8437c5ec557d48949da1125aea4e1 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Fri, 5 Oct 2007 18:56:36 +0000 Subject: [PATCH] Fixes for multiple connection handling. --- lib/Doctrine/Import.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/Import.php b/lib/Doctrine/Import.php index 8d2b69059..cedd08338 100644 --- a/lib/Doctrine/Import.php +++ b/lib/Doctrine/Import.php @@ -185,17 +185,21 @@ class Doctrine_Import extends Doctrine_Connection_Module */ public function importSchema($directory, array $databases = array()) { - $builder = new Doctrine_Import_Builder(); - $builder->setTargetPath($directory); - - $classes = array(); - foreach ($this->listTables() as $table) { - $builder->buildRecord(array('tableName' => $table, - 'className' => Doctrine::classify($table)), - $this->listTableColumns($table), - array()); + $connections = Doctrine_Manager::getInstance()->getConnections(); - $classes[] = Doctrine::classify($table); + foreach ($connections as $connection) { + $builder = new Doctrine_Import_Builder(); + $builder->setTargetPath($directory); + + $classes = array(); + foreach ($connection->import->listTables() as $table) { + $builder->buildRecord(array('tableName' => $table, + 'className' => Doctrine::classify($table)), + $connection->import->listTableColumns($table), + array()); + + $classes[] = Doctrine::classify($table); + } } return $classes;