Doctrine

Timestamp:

03/12/08 22:16:21 (2 years ago)

Author:

jwage

Message:

fixed #691 fixes #750

Files:

• branches/0.10/lib/Doctrine/Connection.php (modified) (5 diffs)

branches/0.10/lib/Doctrine/Connection.php

@@ -1378 +1378 @@
     }
 
+    /**
+     * createDatabase
+     *
+     * Issue create database command for this instance of Doctrine_Connection
+     *
+     * @return mixed Returns Doctrine_Exception or success string
+     */
     public function createDatabase()
     {
@@ -1395 +1402 @@
         } catch (Exception $e) {}
 
-        // Close the temporary connection used to issue the drop database command
-        $this->getManager()->closeConnection($tmpConnection);
-
-        // Re-create Doctrine style dsn
-        $dsn = $info['scheme'] . '://' . $this->getOption('username') . ':' . $this->getOption('password') . '@' . $info['host'] . '/' . $info['dbname'];
-
-        // Re-open connection with the newly created database
-        $this->getManager()->openConnection($dsn, $this->getName(), true);
-
         if (isset($e)) {
             return $e;
         } else {
+            // Close the temporary connection used to issue the drop database command
+            $this->getManager()->closeConnection($tmpConnection);
+
+            // Re-create Doctrine style dsn
+            $dsn = $info['scheme'] . '://' . $this->getOption('username') . ':' . $this->getOption('password') . '@' . $info['host'] . '/' . $info['dbname'];
+
+            // Re-open connection with the newly created database
+            $this->getManager()->openConnection($dsn, $this->getName(), true);
+
             return 'Successfully created database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
         }
@@ -1414 +1421 @@
      * 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
+     * Issue drop database command for this instance of Doctrine_Connection
+     *
+     * @return mixed Returns Doctrine_Exception or success string
      */
     public function dropDatabase()
@@ -1435 +1442 @@
         } catch (Exception $e) {}
 
-        // Close the temporary connection used to issue the drop database command
-        $this->getManager()->closeConnection($tmpConnection);
-
-        // Re-create Doctrine style dsn
-        $dsn = $info['scheme'] . '://' . $this->getOption('username') . ':' . $this->getOption('password') . '@' . $info['host'] . '/' . $info['dbname'];
-
-        // Re-open connection with the newly created database
-        $this->getManager()->openConnection($dsn, $this->getName(), true);
-
         if (isset($e)) {
             return $e;
         } else {
+            // Close the temporary connection used to issue the drop database command
+            $this->getManager()->closeConnection($tmpConnection);
+
+            // Re-create Doctrine style dsn
+            $dsn = $info['scheme'] . '://' . $this->getOption('username') . ':' . $this->getOption('password') . '@' . $info['host'] . '/' . $info['dbname'];
+
+            // Re-open connection with the newly created database
+            $this->getManager()->openConnection($dsn, $this->getName(), true);
+
             return 'Successfully dropped database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
         }
@@ -1453 +1460 @@
     /**
      * getTmpConnection
+     *
+     * Create a temporary connection to the database with the user credentials.
+     * This is so the user can make a connection to a db server. Some dbms allow
+     * connections with no database, but some do not. In that case we have a table
+     * which is always guaranteed to exist. Mysql: 'mysql', PostgreSQL: 'postgres', etc.
+     * This value is set in the Doctrine_Export_{DRIVER} classes if required
      *
      * @param string $info