Doctrine

Timestamp:

03/11/08 03:27:27 (16 months ago)

Author:

jwage

Message:

A few more create/drop db fixes.

Location:

branches/0.10/lib/Doctrine

Files:

• Connection.php (modified) (2 diffs)
• Export.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Connection.php

@@ -1389 +1389 @@
 
             // Get the temporary connection to issue the drop database command
-            $connect = $this->getTmpConnection($info);
+            $tmpConnection = $this->getTmpConnection($info);
 
             // Issue create database command
-            $connect->export->createDatabase($info['dbname']);
-
-            // 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);
-
+            $tmpConnection->export->createDatabase($info['dbname']);
+        } 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);
+
+        // Close original
+        $this->getManager()->closeConnection($this);
+
+        if (isset($e)) {
+            return $e;
+        } else {
             return 'Successfully created database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
-        } catch (Exception $e) {
-            return $e;
         }
     }
@@ -1427 +1432 @@
 
             // Get the temporary connection to issue the drop database command
-            $connect = $this->getTmpConnection($info);
+            $tmpConnection = $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);
-
+            $tmpConnection->export->dropDatabase($info['dbname']);
+        } 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 {
             return 'Successfully dropped database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
-        } catch (Exception $e) {
-            return $e;
         }
     }

branches/0.10/lib/Doctrine/Export.php

@@ -1264 +1264 @@
     public function exportTable(Doctrine_Table $table)
     {
-        /**
-        TODO: maybe there should be portability option for the following check
-        if ( ! Doctrine::isValidClassname($table->getOption('declaringClass')->getName())) {
-            throw new Doctrine_Export_Exception('Class name not valid.');
-        }
-        */
-
         try {
             $data = $table->getExportableFormat();