From d5c91081e0c05f177784922e27f1b76e9b8a0de7 Mon Sep 17 00:00:00 2001
From: jwage <jwage@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 22 Jan 2008 21:58:03 +0000
Subject: [PATCH] -

---
 lib/Doctrine/Connection.php        | 60 ++++++++++++++++++------------
 lib/Doctrine/Connection/Mysql.php  | 10 -----
 lib/Doctrine/Connection/Sqlite.php | 12 ++++--
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
index 36bdf9e53..ff4a31687 100644
--- a/lib/Doctrine/Connection.php
+++ b/lib/Doctrine/Connection.php
@@ -1402,47 +1402,59 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
     /**
      * 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();
+        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 = $manager->parsePdoDsn($this->getOption('dsn'));
-      $username = $this->getOption('username');
-      $password = $this->getOption('password');
+            $manager = $this->getManager();
 
-      // 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($info['dbname']);
+            $info = $manager->parsePdoDsn($dsn);
+            $username = $this->getOption('username');
+            $password = $this->getOption('password');
 
-          // Close the tmp connection with no database
-          $manager->closeConnection($connect);
+            // 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);
 
-          // Close original connection
-          $manager->closeConnection($this);
+            // Create database
+            $connect->export->createDatabase($info['dbname']);
 
-          // Reopen original connection with newly created database
-          $manager->openConnection(new PDO($info['dsn'], $username, $password), $this->getName(), true);
+            // Close the tmp connection with no database
+            $manager->closeConnection($connect);
 
-          return 'Successfully created database for connection "' . $this->getName() . '" named "' . $info['dbname'] . '"';
-      } catch (Exception $e) {
-          return $e;
-      }
+            // 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
+     * 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 {
-          $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']);
 
@@ -1460,4 +1472,4 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
     {
         return Doctrine_Lib::getConnectionAsString($this);
     }
-}
+}
\ No newline at end of file
diff --git a/lib/Doctrine/Connection/Mysql.php b/lib/Doctrine/Connection/Mysql.php
index 67fc092bf..32cd5aa50 100644
--- a/lib/Doctrine/Connection/Mysql.php
+++ b/lib/Doctrine/Connection/Mysql.php
@@ -90,16 +90,6 @@ class Doctrine_Connection_Mysql extends Doctrine_Connection_Common
         parent::__construct($manager, $adapter);
     }
 
-    /**
-     * returns the name of the connected database
-     *
-     * @return string
-     */
-    public function getDatabaseName()
-    {
-        return $this->fetchOne('SELECT DATABASE()');
-    }
-
     /**
      * Set the charset on the current connection
      *
diff --git a/lib/Doctrine/Connection/Sqlite.php b/lib/Doctrine/Connection/Sqlite.php
index d3e3423b1..b43e9d732 100644
--- a/lib/Doctrine/Connection/Sqlite.php
+++ b/lib/Doctrine/Connection/Sqlite.php
@@ -103,9 +103,11 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
     public function createDatabase()
     {
       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']);
 
@@ -123,7 +125,11 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
     public function dropDatabase()
     {
       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']);