Doctrine

Timestamp:

02/19/08 20:14:55 (17 months ago)

Author:

jwage

Message:

Reversed r3839. Broke tests.

Location:

branches/0.10/lib/Doctrine

Files:

• Export.php (modified) (2 diffs)
• Export/Schema.php (modified) (1 diff)
• Migration/Builder.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Export.php

@@ -1042 +1042 @@
     {
         if ($directory !== null) {
-            Doctrine::loadModels($directory);
-        }
-
-        $models = Doctrine::getLoadedModels();
-
+            $models = Doctrine::loadModels($directory);
+        } else {
+            $models = Doctrine::getLoadedModels();
+        }
+        
         $this->exportClasses($models);
     }
@@ -1247 +1247 @@
         if ($directory !== null) {
             $models = Doctrine::loadModels($directory);
-        }
-
-        $models = Doctrine::getLoadedModels();
-
+        } else {
+            $models = Doctrine::getLoadedModels();
+        }
+        
         return $this->exportClassesSql($models);
     }

branches/0.10/lib/Doctrine/Export/Schema.php

@@ -46 +46 @@
     {
         if ($directory) {
-            Doctrine::loadModels($directory);
+            $loadedModels = Doctrine::loadModels($directory);
+        } else {
+            $loadedModels = Doctrine::getLoadedModels();
         }
-
-        $loadedModels = Doctrine::getLoadedModels();
 
         $array = array();

branches/0.10/lib/Doctrine/Migration/Builder.php

@@ -156 +156 @@
     public function generateMigrationsFromModels($modelsPath = null)
     {
-        if ($modelsPath !== null) {
-            Doctrine::loadModels($modelsPath);
-        }
-
-        $models = Doctrine::getLoadedModels();
-
+        if ($modelsPath) {
+            $models = Doctrine::loadModels($modelsPath);
+        } else {
+            $models = Doctrine::getLoadedModels();
+        }
+        
         $foreignKeys = array();