Merge pull request zendframework#1601 from Leftbrained/hotfix/db-remo…

…ve-default-catalog Zend\Db: Remove the getDefaultCatalog method from Adapter and Connections
guilhermewop · Jun 26, 2012 · 17d680c · 17d680c
2 parents 08bdc99 + c839510
commit 17d680c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/library/Zend/Db/Adapter/Driver/ConnectionInterface.php b/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
@@ -17,7 +17,6 @@
  */
 interface ConnectionInterface
 {
-    public function getDefaultCatalog();
     public function getCurrentSchema();
     public function getResource();
     public function connect();

diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php b/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
@@ -94,16 +94,6 @@ public function getConnectionParameters()
         return $this->connectionParameters;
     }
 
-    /**
-     * Get default catalog
-     * 
-     * @return null 
-     */
-    public function getDefaultCatalog()
-    {
-        return null;
-    }
-
     /**
      * Get current schema
      * 

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -107,14 +107,6 @@ public function getConnectionParameters()
         return $this->connectionParameters;
     }
 
-    /**
-     * @return null
-     */
-    public function getDefaultCatalog()
-    {
-        return null;
-    }
-
     /**
      * Get current schema
      * 

diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
@@ -91,16 +91,6 @@ public function getConnectionParameters()
         return $this->connectionParameters;
     }
 
-    /**
-     * Get default catalog
-     *
-     * @return null
-     */
-    public function getDefaultCatalog()
-    {
-        return null;
-    }
-
     /**
      * Get current schema
      *