Doctrine

Timestamp:

01/22/08 16:58:03 (3 years ago)

Author:

jwage

Message:

-

Location:

trunk/lib/Doctrine

Files:

• Connection.php (modified) (1 diff)
• Connection/Mysql.php (modified) (1 diff)
• Connection/Sqlite.php (modified) (2 diffs)

trunk/lib/Doctrine/Connection.php

@@ -1403 +1403 @@
      * createDatabase
      *
-     * @return void
+     * Method for creating the database for the connection instance
+     *
+     * @return mixed Will return an instance of the exception thrown if the create database fails, otherwise it returns a string detailing the success
      */
     public function createDatabase()
     {
-      $manager = $this->getManager();
-
-      $info = $manager->parsePdoDsn($this->getOption('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);
-      
+        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 {
-          // 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
-     *
-     * @return void
-     */
-    public function dropDatabase()
-    {
-      try {
-          $info = $this->getManager()->parsePdoDsn($this->getOption('dsn'));
+          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']);

trunk/lib/Doctrine/Connection/Mysql.php

@@ -92 +92 @@
 
     /**
-     * returns the name of the connected database
-     *
-     * @return string
-     */
-    public function getDatabaseName()
-    {
-        return $this->fetchOne('SELECT DATABASE()');
-    }
-
-    /**
      * Set the charset on the current connection
      *

trunk/lib/Doctrine/Connection/Sqlite.php

@@ -104 +104 @@
     {
       try {
-          $manager = $this->getManager();
+          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 = $manager->parseDsn($this->getOption('dsn'));
+          $info = $this->getManager()->parseDsn($dsn);
 
           $this->export->createDatabase($info['database']);
@@ -124 +126 @@
     {
       try {
-          $info = $this->getManager()->parseDsn($this->getOption('dsn'));
+          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']);