Doctrine

Timestamp:

03/11/08 02:51:33 (16 months ago)

Author:

jwage

Message:

fixes #848

Location:

branches/0.10/lib/Doctrine

Files:

• Connection.php (modified) (2 diffs)
• Export/Mysql.php (modified) (1 diff)
• Export/Pgsql.php (modified) (1 diff)
• Export/Sqlite.php (modified) (2 diffs)
• Manager.php (modified) (3 diffs)

branches/0.10/lib/Doctrine/Connection.php

@@ -1380 +1380 @@
     public function createDatabase()
     {
+        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');
+        }
+
         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
+            // Parse pdo dsn so we are aware of the connection information parts
+            $info = $this->getManager()->parsePdoDsn($dsn);
+
+            // Get the temporary connection to issue the drop database command
+            $connect = $this->getTmpConnection($info);
+
+            // Issue create database command
             $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);
+            // Close the temporary connection used to issue the drop database command
+            $this->getManager()->closeConnection($connect);
+
+            // Close original
+            $this->getManager()->closeConnection($this);
+
+            // Re-open connection with the newly created database
+            $this->getManager()->openConnection(new PDO($dsn, $this->getOption('username'), $this->getOption('password')), $this->getName(), true);
 
             return 'Successfully created database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
@@ -1421 +1418 @@
     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;
-      }
+        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');
+        }
+
+        try {
+            // Parse pdo dsn so we are aware of the connection information parts
+            $info = $this->getManager()->parsePdoDsn($dsn);
+
+            // Get the temporary connection to issue the drop database command
+            $connect = $this->getTmpConnection($info);
+
+            // Issue drop database command
+            $connect->export->dropDatabase($info['dbname']);
+
+            // Close the temporary connection used to issue the drop database command
+            $this->getManager()->closeConnection($connect);
+
+            return 'Successfully dropped database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
+        } catch (Exception $e) {
+            return $e;
+        }
+    }
+
+    /**
+     * getTmpConnection
+     *
+     * @param string $info 
+     * @return void
+     */
+    public function getTmpConnection($info)
+    {
+        $pdoDsn = $info['scheme'] . ':host=' . $info['host'];
+
+        if (isset($this->export->tmpConnectionDatabase) && $this->export->tmpConnectionDatabase) {
+            $pdoDsn .= ';dbname=' . $this->export->tmpConnectionDatabase;
+        }
+
+        $username = $this->getOption('username');
+        $password = $this->getOption('password');
+
+        return $this->getManager()->openConnection(new PDO($pdoDsn, $username, $password), 'doctrine_tmp_connection', false);
     }
 

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

@@ -34 +34 @@
 class Doctrine_Export_Mysql extends Doctrine_Export
 {
-   /**
-     * create a new database
-     *
-     * @param string $name name of the database that should be created
-     * @return string
+    /**
+     * createDatabaseSql
+     *
+     * @param string $name 
+     * @return void
      */
     public function createDatabaseSql($name)

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

@@ -34 +34 @@
 class Doctrine_Export_Pgsql extends Doctrine_Export
 {
-   /**
-     * create a new database
-     *
-     * @param string $name name of the database that should be created
-     * @throws PDOException
+    public $tmpConnectionDatabase = 'postgres';
+
+    /**
+     * createDatabaseSql
+     *
+     * @param string $name 
      * @return void
      */

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

@@ -89 +89 @@
      *                                 drivers of those that do not support it ignore this property. Use the
      *                                 function support() to determine whether the DBMS driver can manage indexes.
-
      *                                 Example
      *                                    array(
@@ -220 +219 @@
             }
         }
+
         return $query;
-        
-        
-        /**
-        try {
-
-            if ( ! empty($fk)) {
-                $this->conn->beginTransaction();
-            }
-
-            $ret   = $this->conn->exec($query);
-
-            if ( ! empty($fk)) {
-                foreach ($fk as $definition) {
-
-                    $query = 'CREATE TRIGGER doctrine_' . $name . '_cscd_delete '
-                           . 'AFTER DELETE ON ' . $name . ' FOR EACH ROW '
-                           . 'BEGIN '
-                           . 'DELETE FROM ' . $definition['foreignTable'] . ' WHERE ';
-
-                    $local = (array) $definition['local'];
-                    foreach((array) $definition['foreign'] as $k => $field) {
-                        $query .= $field . ' = old.' . $local[$k] . ';';
-                    }
-
-                    $query .= 'END;';
-
-                    $this->conn->exec($query);
-                }
-
-                $this->conn->commit();
-            }
-
-
-        } catch(Doctrine_Exception $e) {
-
-            $this->conn->rollback();
-
-            throw $e;
-        }
-        */
     }
 

branches/0.10/lib/Doctrine/Manager.php

@@ -19 +19 @@
  * <http://www.phpdoctrine.org>.
  */
-
+Doctrine::autoload('Doctrine_Configurable');
 /**
  *
@@ -704 +704 @@
 
         foreach ($this as $name => $connection) {
-            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
+            if ( ! empty($specifiedConnections) && ! in_array($name, $specifiedConnections)) {
                 continue;
             }
@@ -732 +732 @@
 
         foreach ($this as $name => $connection) {
-            if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
+            if ( ! empty($specifiedConnections) && ! in_array($name, $specifiedConnections)) {
                 continue;
             }