Doctrine

Timestamp:

05/10/08 03:04:35 (14 months ago)

Author:

jwage

Message:

fixes #1011

Files:

• branches/0.11/lib/Doctrine/Export.php (modified) (3 diffs)

branches/0.11/lib/Doctrine/Export.php

@@ -1048 +1048 @@
     }
 
-    /**
-     * exportClasses
-     * method for exporting Doctrine_Record classes to a schema
-     *
-     * FIXME: This function has ugly hacks in it to make sure sql is inserted in the correct order.
-     *
-     * @throws Doctrine_Connection_Exception    if some error other than Doctrine::ERR_ALREADY_EXISTS
-     *                                          occurred during the create table operation
-     * @param array $classes
-     * @return void
-     */
-     public function exportClasses(array $classes)
-     {
+    public function exportSortedClassesSql($classes, $groupByConnection = true)
+    {
          $connections = array();
          foreach ($classes as $class) {
@@ -1120 +1109 @@
          }
 
-         foreach ($build as $connectionName => $sql) {
+         if ( ! $groupByConnection) {
+             $new = array();
+             foreach($build as $connectionname => $sql) {
+                 $new = array_merge($new, $sql);
+             }
+             $build = $new;
+         }
+         return $build;
+    }
+
+    /**
+     * exportClasses
+     * method for exporting Doctrine_Record classes to a schema
+     *
+     * FIXME: This function has ugly hacks in it to make sure sql is inserted in the correct order.
+     *
+     * @throws Doctrine_Connection_Exception    if some error other than Doctrine::ERR_ALREADY_EXISTS
+     *                                          occurred during the create table operation
+     * @param array $classes
+     * @return void
+     */
+     public function exportClasses(array $classes)
+     {
+         $queries = $this->exportSortedClassesSql($classes);
+
+         foreach ($queries as $connectionName => $sql) {
              $connection = Doctrine_Manager::getInstance()->getConnection($connectionName);
 
@@ -1269 +1283 @@
         }
         
-        return $this->exportClassesSql($models);
+        return $this->exportSortedClassesSql($models, false);
     }