Doctrine

Timestamp:

02/15/08 16:50:08 (17 months ago)

Author:

jwage

Message:

Merging r3565 to 0.9 branch.

Location:

branches/0.9

Files:

• lib/Doctrine.php (modified) (11 diffs)
• lib/Doctrine/Configurable.php (modified) (2 diffs)
• lib/Doctrine/Connection.php (modified) (4 diffs)
• lib/Doctrine/Connection/Sqlite.php (modified) (1 diff)
• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Export.php (modified) (1 diff)
• lib/Doctrine/Export/Sqlite.php (modified) (1 diff)
• lib/Doctrine/Manager.php (modified) (14 diffs)
• lib/Doctrine/Query.php (modified) (1 diff)
• lib/Doctrine/Task/CreateDb.php (modified) (1 diff)
• lib/Doctrine/Task/DropDb.php (modified) (1 diff)
• manual/docs/en/facade.txt (modified) (1 diff)
• tests/Export/SqliteTestCase.php (modified) (1 diff)
• tests/ManagerTestCase.php (modified) (1 diff)
• tests/TreeStructureTestCase.php (modified) (1 diff)
• tools/sandbox/config.php.dist (modified) (2 diffs)
• tools/sandbox/sandbox.db (modified) (previous)

branches/0.9/lib/Doctrine.php

@@ -188 +188 @@
     const ATTR_THROW_EXCEPTIONS         = 155;
     const ATTR_DEFAULT_PARAM_NAMESPACE  = 156;
+    const ATTR_MODEL_LOADING            = 167;
 
     /**
@@ -422 +423 @@
 
     /**
+     * MODEL_LOADING_AGGRESSIVE
+     *
+     * Constant for agressive model loading
+     * Will require_once() all found model files
+     *
+     * @see self::ATTR_MODEL_LOADING
+     */
+    const MODEL_LOADING_AGGRESSIVE   = 1;
+
+    /**
+     * MODEL_LOADING_CONSERVATIVE
+     *
+     * Constant for conservative model loading
+     * Will not require_once() found model files inititally instead it will build an array
+     * and reference it in autoload() when a class is needed it will require_once() it
+     *
+     * @see self::ATTR_MODEL_LOADING
+     */
+    const MODEL_LOADING_CONSERVATIVE= 2;
+
+    /**
      * Path
      *
@@ -444 +466 @@
      * @var array
      */
-    private static $_loadedModels = array();
+    private static $_loadedModelFiles = array();
 
     private static $_pathModels = array();
@@ -469 +491 @@
     public static function getLoadedModelFiles()
     {
-        // [TODO] This method is just a wrapper of _loadedModels
-        // (which has named changed to _loadedModelFiles). The next task is
-        // to rename the _loadedModels to _loadedModelFiles inside Doctrine
-        return self::$_loadedModels;
-    }
-
+        return self::$_loadedModelFiles;
+    }
+    
     public static function getPathModels()
     {
@@ -514 +533 @@
      *
      * Recursively load all models from a directory or array of directories
-     * 
-     * @param string $directory Path to directory of models or array of directory paths
+     *
+     * @param string $directory    Path to directory of models or array of directory paths
      * @return array $loadedModels
      */
     public static function loadModels($directory)
     {
+        $loadedModels = array();
+        
         if ($directory !== null) {
             $manager = Doctrine_Manager::getInstance();
@@ -526 +547 @@
                 $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
                                                         RecursiveIteratorIterator::LEAVES_ONLY);
-
                 foreach ($it as $file) {
                     $e = explode('.', $file->getFileName());
                     if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
-                        self::$_loadedModels[$e[0]] = $file->getPathName();
-                        self::$_pathModels[$file->getPathName()][$e[0]] = $e[0];
+                        
+                        if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) === Doctrine::MODEL_LOADING_CONSERVATIVE) {
+                            self::$_loadedModelFiles[$e[0]] = $file->getPathName();
+                            self::$_pathModels[$file->getPathName()][$e[0]] = $e[0];
+
+                            $loadedModels[] = $e[0];
+                        } else {
+                            $declaredBefore = get_declared_classes();
+                            require_once($file->getPathName());
+                            
+                            $declaredAfter = get_declared_classes();
+                            // Using array_slice because array_diff is broken is some PHP versions
+                            $foundClasses = array_slice($declaredAfter, count($declaredBefore) - 1);
+                            if ($foundClasses) {
+                                foreach ($foundClasses as $className) {
+                                    if (self::isValidModelClass($className) && !in_array($className, $loadedModels)) {
+                                        $loadedModels[] = $className;
+
+                                        self::$_pathModels[$file->getPathName()][$className] = $className;
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
@@ -537 +578 @@
         }
 
-        return self::getLoadedModels(array_keys(self::$_loadedModels));
+        return self::filterInvalidModels($loadedModels);
     }
 
@@ -544 +585 @@
      *
      * Get all the loaded models, you can provide an array of classes or it will use get_declared_classes()
-     * 
+     *
      * Will filter through an array of classes and return the Doctrine_Records out of them.
      * If you do not specify $classes it will return all of the currently loaded Doctrine_Records
      *
-     * @param $classes Array of classes to filter through, otherwise uses get_declared_classes()
-     * @return array $loadedModels
+     * @return array   $loadedModels
      */
     public static function getLoadedModels($classes = null)
     {
-        if ($classes === null) {
+        if ($classes == null)
+        {
             $classes = get_declared_classes();
-            $classes = array_merge($classes, array_keys(self::$_loadedModels));
-        }
-        
-        $parent = new ReflectionClass('Doctrine_Record');
-        
-        $loadedModels = array();
-        
+            $classes = array_merge($classes, array_keys(self::$_loadedModelFiles));
+        }
+        
+        return self::filterInvalidModels($classes);
+    }
+
+    /**
+     * filterInvalidModels
+     *
+     * Filter through an array of classes and return all the classes that are valid models
+     *
+     * @param classes  Array of classes to filter through, otherwise uses get_declared_classes()
+     * @return array   $loadedModels
+     */
+    public static function filterInvalidModels($classes)
+    {
+        $validModels = array();
+
         foreach ((array) $classes as $name) {
-            $class = new ReflectionClass($name);
-            
+            if (self::isValidModelClass($name) && !in_array($name, $validModels)) {
+                $validModels[] = $name;
+            }
+        }
+
+        return $validModels;
+    }
+
+    /**
+     * isValidModelClass
+     *
+     * Checks if what is passed is a valid Doctrine_Record
+     *
+     * @param   mixed   $class Can be a string named after the class, an instance of the class, or an instance of the class reflected
+     * @return  boolean
+     */
+    public static function isValidModelClass($class)
+    {
+        if ($class instanceof Doctrine_Record) {
+            $class = get_class($class);
+        }
+
+        if (is_string($class) && class_exists($class)) {
+            $class = new ReflectionClass($class);
+        }
+
+        if ($class instanceof ReflectionClass) {
             // Skip the following classes
             // - abstract classes
-            // - not a subclass of Doctrine_Record 
+            // - not a subclass of Doctrine_Record
             // - don't have a setTableDefinition method
-            if ($class->isAbstract() || 
-                !$class->isSubClassOf($parent) || 
-                !$class->hasMethod('setTableDefinition')) {
-                continue;
+            if (!$class->isAbstract() &&
+                $class->isSubClassOf('Doctrine_Record') &&
+                $class->hasMethod('setTableDefinition')) {
+
+                return true;
             }
-            
-            $loadedModels[] = $name;
-        }
-        
-        return $loadedModels;
+        }
+
+        return false;
     }
 
@@ -732 +808 @@
     public static function createDatabases($specifiedConnections = array())
     {
-        if ( ! is_array($specifiedConnections)) {
-            $specifiedConnections = (array) $specifiedConnections;
-        }
-        
-        $manager = Doctrine_Manager::getInstance();
-        $connections = $manager->getConnections();
-        
-        $results = array();
-        
-        foreach ($connections as $name => $connection) {
-            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
-                continue;
-            }
-            
-            $info = $manager->parsePdoDsn($connection->getOption('dsn'));
-            $username = $connection->getOption('username');
-            $password = $connection->getOption('password');
-            
-            // Make connection without database specified so we can create it
-            $connect = $manager->openConnection(new PDO($info['scheme'] . ':host=' . $info['host'], $username, $password), 'tmp_connection', false);
-            
-            try {
-                // Create database
-                $connect->export->createDatabase($name);
-                
-                // Close the tmp connection with no database
-                $manager->closeConnection($connect);
-                
-                // Close original connection
-                $manager->closeConnection($connection);
-                
-                // Reopen original connection with newly created database
-                $manager->openConnection(new PDO($info['dsn'], $username, $password), $name, true);
-                
-                $results[$name] = true;
-            } catch (Exception $e) {
-                $results[$name] = false;
-            }
-        }
-        
-        return $results;
+        return Doctrine_Manager::getInstance()->createDatabases($specifiedConnections);
     }
 
@@ -785 +821 @@
     public static function dropDatabases($specifiedConnections = array())
     {
-        if ( ! is_array($specifiedConnections)) {
-            $specifiedConnections = (array) $specifiedConnections;
-        }
-        
-        $manager = Doctrine_Manager::getInstance();
-        
-        $connections = $manager->getConnections();
-        
-        $results = array();
-        
-        foreach ($connections as $name => $connection) {
-            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
-                continue;
-            }
-            
-            try {
-                $connection->export->dropDatabase($name);
-                
-                $results[$name] = true;
-            } catch (Exception $e) {
-                $results[$name] = false;
-            }
-        }
-        
-        return $results;
+        return Doctrine_Manager::getInstance()->dropDatabases($specifiedConnections);
     }
 
@@ -975 +987 @@
         }
         
-        $loadedModels = self::$_loadedModels;
-        
+        $loadedModels = self::$_loadedModelFiles;
+
         if (isset($loadedModels[$className]) && file_exists($loadedModels[$className])) {
-            require_once($loadedModels[$className]);
-            
+            require_once $loadedModels[$className];
+
             return true;
         }

branches/0.9/lib/Doctrine/Configurable.php

@@ -140 +140 @@
             case Doctrine::ATTR_THROW_EXCEPTIONS:
             case Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE:
+            case Doctrine::ATTR_MODEL_LOADING:
 
                 break;
@@ -379 +380 @@
     public function getAttribute($attribute)
     {
+        if (is_string($attribute)) {
+            $upper = strtoupper($attribute);
+
+            $const = 'Doctrine::ATTR_' . $upper; 
+
+            if (defined($const)) {
+                $attribute = constant($const);
+                $this->_state = $attribute;
+            } else {
+                throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"');
+            }
+        }
+
         $attribute = (int) $attribute;
 

branches/0.9/lib/Doctrine/Connection.php

@@ -68 +68 @@
 
     /**
-     * @var string $driverName                  the name of this connection driver
+     * $_name
+     *
+     * Name of the connection
+     *
+     * @var string $_name
+     */
+    protected $_name;
+
+    /**
+     * The name of this connection driver.
+     *
+     * @var string $driverName                  
      */
     protected $driverName;
@@ -289 +300 @@
     public function getName()
     {
+        return $this->_name;
+    }
+
+    /**
+     * setName
+     *
+     * Sets the name of the connection
+     *
+     * @param string $name 
+     * @return void
+     */
+    public function setName($name)
+    {
+        $this->_name = $name;
+    }
+
+    /**
+     * getDriverName
+     *
+     * Gets the name of the instance driver
+     *
+     * @return void
+     */
+    public function getDriverName()
+    {
         return $this->driverName;
     }
@@ -323 +359 @@
                     break;
                 default:
-                    $class = 'Doctrine_' . ucwords($name) . '_' . $this->getName();
+                    $class = 'Doctrine_' . ucwords($name) . '_' . $this->getDriverName();
                     $this->modules[$name] = new $class($this);
                 }
@@ -1262 +1298 @@
     }
 
+    public function createDatabase()
+    {
+        try {
+            if ( ! $dsn = $this->getOption('dsn')) {
+                throw new Doctrine_Connection_Exception('You must create your Doctrine_Connection by using a valid Doctrine style dsn in order to use the create/drop database functionality');
+            }
+
+            $manager = $this->getManager();
+
+            $info = $manager->parsePdoDsn($dsn);
+            $username = $this->getOption('username');
+            $password = $this->getOption('password');
+
+            // Make connection without database specified so we can create it
+            $connect = $manager->openConnection(new PDO($info['scheme'] . ':host=' . $info['host'], $username, $password), 'tmp_connection', false);
+
+            // Create database
+            $connect->export->createDatabase($info['dbname']);
+
+            // Close the tmp connection with no database
+            $manager->closeConnection($connect);
+
+            // Close original connection
+            $manager->closeConnection($this);
+
+            // Reopen original connection with newly created database
+            $manager->openConnection(new PDO($info['dsn'], $username, $password), $this->getName(), true);
+
+            return 'Successfully created database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
+        } catch (Exception $e) {
+            return $e;
+        }
+    }
+
+    /**
+     * dropDatabase
+     *
+     * Method for dropping the database for the connection instance
+     *
+     * @return mixed Will return an instance of the exception thrown if the drop database fails, otherwise it returns a string detailing the success
+     */
+    public function dropDatabase()
+    {
+      try {
+          if ( ! $dsn = $this->getOption('dsn')) {
+              throw new Doctrine_Connection_Exception('You must create your Doctrine_Connection by using a valid Doctrine style dsn in order to use the create/drop database functionality');
+          }
+
+          $info = $this->getManager()->parsePdoDsn($dsn);
+
+          $this->export->dropDatabase($info['dbname']);
+
+          return 'Successfully dropped database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
+      } catch (Exception $e) {
+          return $e;
+      }
+    }
+
     /**
      * returns a string representation of this object

branches/0.9/lib/Doctrine/Connection/Sqlite.php

@@ -99 +99 @@
 
     /**
-     * getDatabaseFile
+     * createDatabase
      *
-     * @param string $name      the name of the database
-     * @return string
+     * @return void
      */
-    public function getDatabaseFile($name)
+    public function createDatabase()
     {
-        return $name . '.db';
+      try {
+          if ( ! $dsn = $this->getOption('dsn')) {
+              throw new Doctrine_Connection_Exception('You must create your Doctrine_Connection by using a valid Doctrine style dsn in order to use the create/drop database functionality');
+          }
+
+          $info = $this->getManager()->parseDsn($dsn);
+
+          $this->export->createDatabase($info['database']);
+
+          return 'Successfully created database for connection "' . $this->getName() . '" at path "' . $info['database'] . '"';
+      } catch (Exception $e) {
+          return $e;
+      }
+    }
+
+    /**
+     * dropDatabase
+     *
+     * @return void
+     */
+    public function dropDatabase()
+    {
+      try {
+          if ( ! $dsn = $this->getOption('dsn')) {
+              throw new Doctrine_Connection_Exception('You must create your Doctrine_Connection by using a valid Doctrine style dsn in order to use the create/drop database functionality');
+          }
+          
+          $info = $this->getManager()->parseDsn($dsn);
+
+          $this->export->dropDatabase($info['database']);
+
+          return 'Successfully dropped database for connection "' . $this->getName() . '" at path "' . $info['database'] . '"';
+      } catch (Exception $e) {
+          return $e;
+      }
     }
 }

branches/0.9/lib/Doctrine/Connection/UnitOfWork.php

@@ -674 +674 @@
             $table->getIdentifierType() != Doctrine::IDENTIFIER_NATURAL) {
 
-            if (strtolower($this->conn->getName()) == 'pgsql') {
+            if (strtolower($this->conn->getDriverName()) == 'pgsql') {
                 $seq = $table->getTableName() . '_' . $keys[0];
             }

branches/0.9/lib/Doctrine/Export.php

@@ -1059 +1059 @@
      * @return void
      */
-    public function exportClasses(array $classes)
-    {
-        $connections = array();
-        foreach ($classes as $class) {
-            $record = new $class();
-            $connection = $record->getTable()->getConnection();
-            $connectionName = Doctrine_Manager::getInstance()->getConnectionName($connection);
-            
-            if ( ! isset($connections[$connectionName])) {
-                $connections[$connectionName] = array();
-                $connections[$connectionName]['creates'] = array();
-                $connections[$connectionName]['alters'] = array();
-            }
-            
-            $sql = $this->exportClassesSql(array($class));
-            // Build array of all the creates
-            // We need these to happen first
-            foreach ($sql as $key => $query) {
-                if (strstr($query, 'CREATE')) {
-                    $connections[$connectionName]['creates'][] = $query;
-                    // Unset the create from sql so we can have an array of everything else but creates
-                    unset($sql[$key]);
-                }
-            }
-            
-            $connections[$connectionName]['alters'] = array_merge($connections[$connectionName]['alters'], $sql);
-        }
-
-        // Loop over all the sql again to merge the creates and alters in to the same array, but so that the alters are at the bottom
-        $build = array();
-        foreach ($connections as $connectionName => $sql) {
-            $build[$connectionName] = array_merge($sql['creates'], $sql['alters']);
-        }
-
-        foreach ($build as $connectionName => $sql) {
-            $connection = Doctrine_Manager::getInstance()->getConnection($connectionName);
-            
-            $connection->beginTransaction();
-            
-            foreach ($sql as $query) {
-                try {
-                    $connection->exec($query);
-                } catch (Doctrine_Connection_Exception $e) {
-                    // we only want to silence table already exists errors
-                    if ($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) {
-                        $connection->rollback();
-                        throw new Doctrine_Export_Exception($e->getMessage() . '. Failing Query: ' . $query);
-                    }
-                }
-            }
-            
-            $connection->commit();
-        }
-    }
+     public function exportClasses(array $classes)
+     { 
+         $connections = array();
+         foreach ($classes as $class) {
+             $record = new $class();
+             $connection = $record->getTable()->getConnection();
+             $connectionName = Doctrine_Manager::getInstance()->getConnectionName($connection);
+
+             if ( ! isset($connections[$connectionName])) {
+                 $connections[$connectionName] = array(
+                     'create_tables' => array(),
+                     'create_sequences' => array(),
+                     'alters' => array()
+                 );
+             }
+
+             $sql = $this->exportClassesSql(array($class));
+
+             // Build array of all the creates
+             // We need these to happen first
+             foreach ($sql as $key => $query) {
+                 if (strstr($query, 'CREATE TABLE')) {
+                     $connections[$connectionName]['create_tables'][] = $query;
+
+                     unset($sql[$key]);
+                 }
+
+                 if (strstr($query, 'CREATE SEQUENCE')) {
+                     $connections[$connectionName]['create_sequences'][] = $query;
+
+                     unset($sql[$key]);
+                 }
+             }
+
+             $connections[$connectionName]['alters'] = array_merge($connections[$connectionName]['alters'], $sql);
+         }
+
+         // Loop over all the sql again to merge the creates and alters in to the same array, but so that the alters are at the bottom
+         $build = array();
+         foreach ($connections as $connectionName => $sql) {
+             $build[$connectionName] = array_merge($sql['create_tables'], $sql['create_sequences'], $sql['alters']);
+         }
+
+         foreach ($build as $connectionName => $sql) {
+             $connection = Doctrine_Manager::getInstance()->getConnection($connectionName);
+
+             $connection->beginTransaction();
+
+             foreach ($sql as $query) {
+                 try {
+                     $connection->exec($query);
+                 } catch (Doctrine_Connection_Exception $e) {
+                     // we only want to silence table already exists errors
+                     if ($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) {
+                         $connection->rollback();
+                         throw new Doctrine_Export_Exception($e->getMessage() . '. Failing Query: ' . $query);
+                     }
+                 }
+             }
+
+             $connection->commit();
+         }
+     }
 
     /**

branches/0.9/lib/Doctrine/Export/Sqlite.php

@@ -35 +35 @@
 {
     /**
+     * dropDatabase
+     *
      * drop an existing database
      *
-     * @param string $name                  name of the database that should be dropped
+     * @param string $databaseFile          Path of the database that should be dropped
      * @throws Doctrine_Export_Exception    if the database file does not exist
      * @throws Doctrine_Export_Exception    if something failed during the removal of the database file
      * @return void
      */
-    public function dropDatabase($name)
-    {
-        $databaseFile = $this->conn->getDatabaseFile($name);
+    public function dropDatabase($databaseFile)
+    {
         if ( ! @file_exists($databaseFile)) {
             throw new Doctrine_Export_Exception('database does not exist');
         }
+
         $result = @unlink($databaseFile);
+
         if ( ! $result) {
             throw new Doctrine_Export_Exception('could not remove the database file');
         }
+    }
+
+    /**
+     * createDatabase
+     *
+     * Create sqlite database file
+     *
+     * @param string $databaseFile  Path of the database that should be dropped
+     * @return void
+     */
+    public function createDatabase($databaseFile)
+    {
+        return new PDO('sqlite:' . $databaseFile);
     }
 

branches/0.9/lib/Doctrine/Manager.php

@@ -253 +253 @@
 
             $driverName = $adapter->getAttribute(Doctrine::ATTR_DRIVER_NAME);
-        } elseif (is_array($adapter)) {
+        } else if (is_array($adapter)) {
             if ( ! isset($adapter[0])) {
                 throw new Doctrine_Manager_Exception('Empty data source name given.');
@@ -267 +267 @@
             $parts['user']   = (isset($adapter[1])) ? $adapter[1] : null;
             $parts['pass']   = (isset($adapter[2])) ? $adapter[2] : null;
-            
+
             $driverName = $e[0];
             $adapter = $parts;
         } else {
             $parts = $this->parseDsn($adapter);
-            
             $driverName = $parts['scheme'];
-            
             $adapter = $parts;
         }
@@ -284 +282 @@
             $name = (string) $name;
             if (isset($this->_connections[$name])) {
+                if ($setCurrent) {
+                    $this->_currIndex = $name;
+                }
                 return $this->_connections[$name];
             }
@@ -290 +291 @@
             $this->_index++;
         }
-
 
         $drivers = array('mysql'    => 'Doctrine_Connection_Mysql',
@@ -303 +303 @@
                          'informix' => 'Doctrine_Connection_Informix',
                          'mock'     => 'Doctrine_Connection_Mock');
+
         if ( ! isset($drivers[$driverName])) {
             throw new Doctrine_Manager_Exception('Unknown driver ' . $driverName);
         }
-        
+
         $className = $drivers[$driverName];
         $conn = new $className($this, $adapter);
+        $conn->setName($name);
 
         $this->_connections[$name] = $conn;
@@ -318 +320 @@
     }
     
+    /**
+     * parsePdoDsn
+     *
+     * @param array $dsn An array of dsn information
+     * @return array The array parsed
+     * @todo package:dbal
+     */
     public function parsePdoDsn($dsn)
     {
         $parts = array();
-        
+
         $names = array('dsn', 'scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment');
 
@@ -329 +338 @@
             }
         }
-        
+
         $e = explode(':', $dsn);
         $parts['scheme'] = $e[0];
         $parts['dsn'] = $dsn;
-        
+
         $e = explode(';', $e[1]);
         foreach ($e as $string) {
-            list($key, $value) = explode('=', $string);
-            $parts[$key] = $value;
-        }
-        
+            if ($string) {
+                $e2 = explode('=', $string);
+
+                if (isset($e2[0]) && isset($e2[1])) {
+                    list($key, $value) = $e2;
+                    $parts[$key] = $value;
+                }
+            }
+        }
+
         return $parts;
     }
@@ -348 +363 @@
      * @param string $dsn
      * @return array Parsed contents of DSN
+     * @todo package:dbal
      */
     public function parseDsn($dsn)
     {
-
-
-        //fix linux sqlite dsn so that it will parse correctly
-        $dsn = str_replace("///", "/", $dsn);
+        // fix sqlite dsn so that it will parse correctly
+        $dsn = str_replace("////", "/", $dsn);
+        $dsn = str_replace("///c:/", "//c:/", $dsn);
 
         // silence any warnings
@@ -389 +404 @@
 
                 break;
-            
+
             case 'mssql':
             case 'dblib':
@@ -401 +416 @@
                     throw new Doctrine_Manager_Exception('No hostname set in data source name');
                 }
-                
+
                 if (isset(self::$driverMap[$parts['scheme']])) {
                     $parts['scheme'] = self::$driverMap[$parts['scheme']];
@@ -409 +424 @@
                               . $parts['host'] . (isset($parts['port']) ? ':' . $parts['port']:null) . ';dbname='
                               . $parts['database'];
-                
+
                 break;
 
@@ -430 +445 @@
                     throw new Doctrine_Manager_Exception('No hostname set in data source name');
                 }
-                
+
                 if (isset(self::$driverMap[$parts['scheme']])) {
                     $parts['scheme'] = self::$driverMap[$parts['scheme']];
@@ -438 +453 @@
                               . $parts['host'] . (isset($parts['port']) ? ';port=' . $parts['port']:null) . ';dbname='
                               . $parts['database'];
-                
+
                 break;
             default:
                 throw new Doctrine_Manager_Exception('Unknown driver '.$parts['scheme']);
         }
-
 
         return $parts;
@@ -663 +677 @@
         }
         return $this->_connections[$i];
+    }
+
+    /**
+     * createDatabases
+     *
+     * Creates databases for connections
+     *
+     * @param string $specifiedConnections Array of connections you wish to create the database for
+     * @return void
+     * @todo package:dbal
+     */
+    public function createDatabases($specifiedConnections = array())
+    {
+        if ( ! is_array($specifiedConnections)) {
+            $specifiedConnections = (array) $specifiedConnections;
+        }
+
+        $results = array();
+
+        foreach ($this as $name => $connection) {
+            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
+                continue;
+            }
+
+            $results[$name] = $connection->createDatabase();
+        }
+
+        return $results;
+    }
+
+    /**
+     * dropDatabases
+     *
+     * Drops databases for connections
+     *
+     * @param string $specifiedConnections Array of connections you wish to drop the database for
+     * @return void
+     * @todo package:dbal
+     */
+    public function dropDatabases($specifiedConnections = array())
+    {
+        if ( ! is_array($specifiedConnections)) {
+            $specifiedConnections = (array) $specifiedConnections;
+        }
+
+        $results = array();
+
+        foreach ($this as $name => $connection) {
+            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
+                continue;
+            }
+
+            $results[$name] = $connection->dropDatabase();
+        }
+
+        return $results;
     }
 

branches/0.9/lib/Doctrine/Query.php

@@ -1196 +1196 @@
 
 
-                switch (strtolower($this->_conn->getName())) {
+                switch (strtolower($this->_conn->getDriverName())) {
                     case 'mysql':
                         // mysql doesn't support LIMIT in subqueries

branches/0.9/lib/Doctrine/Task/CreateDb.php

@@ -40 +40 @@
         $results = Doctrine::createDatabases();
         
-        foreach ($results as $dbName => $bool) {
-            $msg = $bool ? 'Successfully created database named: "' . $dbName . '"':'Could not create database named: "' .$dbName . '"';
+        foreach ($results as $name => $result) {
+            $msg = $result instanceof Exception ? 'Could not create database for connection: "' .$name . '." Failed with exception: ' . $result->getMessage():$result;
             
             $this->notify($msg);

branches/0.9/lib/Doctrine/Task/DropDb.php

@@ -51 +51 @@
         $results = Doctrine::dropDatabases();
 
-        foreach ($results as $dbName => $bool) {
-            $msg = $bool ? 'Successfully dropped database named: "' . $dbName . '"':'Could not drop database named: "' .$dbName . '"';
+        foreach ($results as $name => $result) {
+            $msg = $result instanceof Exception ? 'Could not drop database for connection: "' .$name . '." Failed with exception: ' . $result->getMessage():$result;
 
             $this->notify($msg);

branches/0.9/manual/docs/en/facade.txt

@@ -29 +29 @@
 
 // Pass an array of classes to the above method and it will filter out the ones that are not Doctrine_Records
-$models = Doctrine::getLoadedModels(array('User', 'Formatter', 'Doctrine_Record'));
+$models = Doctrine::filterInvalidModels(array('User', 'Formatter', 'Doctrine_Record'));
 print_r($models); // would return array('User') because Formatter and Doctrine_Record are not Doctrine_Records
 

branches/0.9/tests/Export/SqliteTestCase.php

@@ -33 +33 @@
 class Doctrine_Export_Sqlite_TestCase extends Doctrine_UnitTestCase 
 {
-    public function testCreateDatabaseDoesNotExecuteSql() 
+    public function testCreateDatabaseDoesNotExecuteSqlAndCreatesSqliteFile()
     {
-        try {
-            $this->export->createDatabase('db');
-            $this->fail();
-        } catch(Doctrine_Export_Exception $e) {
-            $this->pass();
-        }
+        $this->export->createDatabase('sqlite.db');
+      
+        $this->assertTrue(file_exists('sqlite.db'));
     }
-    public function testDropDatabaseDoesNotExecuteSql() 
+    public function testDropDatabaseDoesNotExecuteSqlAndDeletesSqliteFile()
     {
-        try {
-            $this->export->dropDatabase('db');
-            $this->fail();
-        } catch(Doctrine_Export_Exception $e) {
-            $this->pass();
-        }
+        $this->export->dropDatabase('sqlite.db');
+
+        $this->assertFalse(file_exists('sqlite.db'));
     }
     public function testCreateTableSupportsAutoincPks() 

branches/0.9/tests/ManagerTestCase.php

@@ -66 +66 @@
         // It expects only // since it thinks it is parsing a url
         // The problem after that is that the dns is not valid when being passed to PDO
-        $sqlite = 'sqlite:///full/unix/path/to/file.db';
-        $sqlitewin = 'sqlite://c:/full/windows/path/to/file.db';
+        $sqlite = 'sqlite:////full/unix/path/to/file.db';
+        $sqlitewin = 'sqlite:///c:/full/windows/path/to/file.db';
         
         $manager = Doctrine_Manager::getInstance();

branches/0.9/tests/TreeStructureTestCase.php

@@ -104 +104 @@
         $o4->save();
 
-        $o1->Children;
         $this->assertFalse(isset($o1->Parent));
+        $this->assertTrue(isset($o2->Parent));
+        $this->assertTrue($o2->Parent === $o1);
+        $this->assertFalse(isset($o4->Parent));
+      
         $this->assertTrue(count($o1->Children) == 2);
         $this->assertTrue(count($o1->get('Children')) == 2);
 
-        $this->assertTrue(isset($o2->Parent));
-        $this->assertTrue($o2->Parent === $o1);
-
         $this->assertTrue(count($o4->Children) == 0);
-        $this->assertFalse(isset($o4->Parent));
     }
     public function testTreeStructureFetchingWorksWithDql()

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

@@ -43 +43 @@
 define('YAML_SCHEMA_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'schema');
 define('DB_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'sandbox.db');
-define('DSN', 'sqlite:' . DB_PATH);
+define('DSN', 'sqlite:///' . DB_PATH);
 
 require_once(DOCTRINE_PATH . DIRECTORY_SEPARATOR . 'Doctrine.php');
@@ -49 +49 @@
 spl_autoload_register(array('Doctrine', 'autoload'));
 
-$pdo = new PDO(DSN);
-Doctrine_Manager::connection($pdo, 'sandbox');
+Doctrine_Manager::connection(DSN, 'sandbox');
+
+Doctrine_Manager::getInstance()->setAttribute('model_loading', 'conservative');