Changeset 2951 for trunk/lib/Doctrine.php

Timestamp:

10/20/07 20:14:30 (15 months ago)

Author:

jwage

Message:

Enhancing CLI. New commands and cleaning up.

Files:

• trunk/lib/Doctrine.php (modified) (5 diffs)

trunk/lib/Doctrine.php

@@ -735 +735 @@
      * @return void
      */
-    public static function createDatabases($specifiedConnections)
+    public static function createDatabases($specifiedConnections = array())
     {
         if (!is_array($specifiedConnections)) {
@@ -741 +741 @@
         }
         
-        $connections = Doctrine_Manager::getInstance()->getConnections();
+        $manager = Doctrine_Manager::getInstance();
+        $connections = $manager->getConnections();
         
         foreach ($connections as $name => $connection) {
@@ -748 +749 @@
             }
             
-            $connection->export->createDatabase($name);
+            $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);
+            } catch (Exception $e) {
+                
+            }
         }
     }
@@ -766 +788 @@
         }
         
-        $connections = Doctrine_Manager::getInstance()->getConnections();
+        $manager = Doctrine_Manager::getInstance();
+        
+        $connections = $manager->getConnections();
         
         foreach ($connections as $name => $connection) {
@@ -773 +797 @@
             }
             
-            $connection->export->dropDatabase($name);
+            try {
+                $connection->export->dropDatabase($name);
+            } catch (Exception $e) {
+                
+            }
         }
     }