Doctrine

Timestamp:

02/19/08 23:30:54 (17 months ago)

Author:

jwage

Message:

Fixes to model loading across the board. Breakage occurred after conservative model loading was fixed to actually be conservative.

Location:

branches/0.10

Files:

• lib/Doctrine.php (modified) (2 diffs)
• lib/Doctrine/Export.php (modified) (3 diffs)
• lib/Doctrine/Export/Schema.php (modified) (2 diffs)
• lib/Doctrine/Migration.php (modified) (2 diffs)
• lib/Doctrine/Migration/Builder.php (modified) (3 diffs)
• tools/sandbox/config.php.dist (modified) (1 diff)
• tools/sandbox/index.php.dist (modified) (1 diff)

branches/0.10/lib/Doctrine.php

@@ -566 +566 @@
                             if ($foundClasses) {
                                 foreach ($foundClasses as $className) {
-                                    if (self::isValidModelClass($className) && !in_array($className, $loadedModels)) {
+                                    if (self::isValidModelClass($className)) {
                                         $loadedModels[] = $className;
 
+                                        self::$_loadedModelFiles[$className] = $file->getPathName();
                                         self::$_pathModels[$file->getPathName()][$className] = $className;
                                     }
@@ -579 +580 @@
         }
 
-        // We do not want to filter invalid models when using conservative model loading
-        // The filtering requires that the class be loaded and inflected in order to determine if it is 
-        // a valid class.
-        if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) == Doctrine::MODEL_LOADING_CONSERVATIVE) {
-            return $loadedModels;
-        } else {
-            return self::filterInvalidModels($loadedModels);
-        }
+        return $loadedModels;
     }
 

branches/0.10/lib/Doctrine/Export.php

@@ -1042 +1042 @@
     {
         if ($directory !== null) {
-            $models = Doctrine::loadModels($directory);
+            $models = Doctrine::filterInvalidModels(Doctrine::loadModels($directory));
         } else {
             $models = Doctrine::getLoadedModels();
         }
-        
+
         $this->exportClasses($models);
     }
@@ -1060 +1060 @@
      */
      public function exportClasses(array $classes)
-     { 
+     {
          $connections = array();
          foreach ($classes as $class) {
-             $record = new $class();
-             $connection = $record->getTable()->getConnection();
-             $connectionName = Doctrine_Manager::getInstance()->getConnectionName($connection);
+             $connection = Doctrine_Manager::getInstance()->getConnectionForComponent($class);
+             $connectionName = $connection->getName();
 
              if ( ! isset($connections[$connectionName])) {
@@ -1246 +1245 @@
     {
         if ($directory !== null) {
-            $models = Doctrine::loadModels($directory);
+            $models = Doctrine::filterInvalidModels(Doctrine::loadModels($directory));
         } else {
             $models = Doctrine::getLoadedModels();

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

@@ -45 +45 @@
     public function buildSchema($directory = null, $models = array())
     {
-        if ($directory) {
-            $loadedModels = Doctrine::loadModels($directory);
+        if ($directory !== null) {
+            $loadedModels = Doctrine::filterInvalidModels(Doctrine::loadModels($directory));
         } else {
             $loadedModels = Doctrine::getLoadedModels();
         }
-
+        
         $array = array();
         
@@ -65 +65 @@
             }
 
-            $record = new $className();
-            $recordTable  = $record->getTable();
+            $recordTable = Doctrine::getTable($className);
             
             $data = $recordTable->getExportableFormat();

branches/0.10/lib/Doctrine/Migration.php

@@ -123 +123 @@
      * @return void
      */
-    public function loadMigrationClassesFromDirectory($classes){
+    public function loadMigrationClassesFromDirectory()
+    {
+        $classes = get_declared_classes();
+        
         foreach ((array) $this->_migrationClassesDirectory as $dir) {
             $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
@@ -155 +158 @@
     protected function loadMigrationClasses()
     {
-        if ($this->_migrationClasses) {
-            return $this->_migrationClasses;
-        }
-        
-        $classes = get_declared_classes();
-        
         if ($this->_migrationClassesDirectory !== null) {
-            $this->loadMigrationClassesFromDirectory($classes);
-        }
-
+            $this->loadMigrationClassesFromDirectory();
+        }
         
         $parent = new ReflectionClass('Doctrine_Migration');

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

@@ -156 +156 @@
     public function generateMigrationsFromModels($modelsPath = null)
     {
-        if ($modelsPath) {
-            $models = Doctrine::loadModels($modelsPath);
+        if ($modelsPath !== null) {
+            $models = Doctrine::filterInvalidModels(Doctrine::loadModels($modelsPath));
         } else {
             $models = Doctrine::getLoadedModels();
@@ -173 +173 @@
             
             $className = 'Add' . Doctrine::classify($export['tableName']);
-            
+
             $this->generateMigrationClass($className, array(), $up, $down);
         }
         
-        $className = 'ApplyForeignKeyConstraints';
-        
-        $up = '';
-        $down = '';
-        foreach ($foreignKeys as $tableName => $definitions)    {
-            $tableForeignKeyNames[$tableName] = array();
-            
-            foreach ($definitions as $definition) {
-                $definition['name'] = $tableName . '_' . $definition['foreignTable'] . '_' . $definition['local'] . '_' . $definition['foreign'];
+        if ( ! empty($foreignKeys)) {
+            $className = 'ApplyForeignKeyConstraints';
+        
+            $up = '';
+            $down = '';
+            foreach ($foreignKeys as $tableName => $definitions)    {
+                $tableForeignKeyNames[$tableName] = array();
+            
+                foreach ($definitions as $definition) {
+                    $definition['name'] = $tableName . '_' . $definition['foreignTable'] . '_' . $definition['local'] . '_' . $definition['foreign'];
                 
-                $up .= $this->buildCreateForeignKey($tableName, $definition);
-                $down .= $this->buildDropForeignKey($tableName, $definition);
+                    $up .= $this->buildCreateForeignKey($tableName, $definition);
+                    $down .= $this->buildDropForeignKey($tableName, $definition);
+                }
             }
-        }
-        
-        $this->generateMigrationClass($className, array(), $up, $down);
+        
+            $this->generateMigrationClass($className, array(), $up, $down);
+        }
         
         return true;
@@ -274 +276 @@
             $path = $this->getMigrationsPath() . DIRECTORY_SEPARATOR . $fileName;
             
+            if ( class_exists($className)) {
+                throw new Doctrine_Exception('Migration class with the name "' . $className . '" already exists.');
+            }
+            
             file_put_contents($path, $class);
         }

branches/0.10/tools/sandbox/config.php.dist

@@ -52 +52 @@
 
 Doctrine_Manager::getInstance()->setAttribute('model_loading', 'conservative');
-
-Doctrine::loadModels('models');

branches/0.10/tools/sandbox/index.php.dist

@@ -1 +1 @@
 <?php
 require_once('config.php');
+
+Doctrine::loadModels('models');