Removing all references to mysqli

cakephp · Oct 17, 2010 · cbdfb3f · cbdfb3f
1 parent 78717ab
commit cbdfb3f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 670 deletions.
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
@@ -100,7 +100,7 @@ protected function _interactive() {
 				}
 			}
 
-			$driver = $this->in('Driver:', array('db2', 'firebird', 'mssql', 'mysql', 'mysqli', 'odbc', 'oracle', 'postgres', 'sqlite', 'sybase'), 'mysql');
+			$driver = $this->in('Driver:', array('db2', 'firebird', 'mssql', 'mysql', 'odbc', 'oracle', 'postgres', 'sqlite', 'sybase'), 'mysql');
 
 			$persistent = $this->in('Persistent Connection?', array('y', 'n'), 'n');
 			if (strtolower($persistent) == 'n') {

diff --git a/cake/console/templates/skel/config/database.php.default b/cake/console/templates/skel/config/database.php.default
@@ -31,7 +31,6 @@
  *
  * driver => The name of a supported driver; valid options are as follows:
  *		mysql 		- MySQL 4 & 5,
- *		mysqli 		- MySQL 4 & 5 Improved Interface (PHP5 only),
  *		sqlite		- SQLite (PHP5 only),
  *		postgres	- PostgreSQL 7 and higher,
  *		mssql		- Microsoft SQL Server 2000 and higher,
@@ -67,7 +66,7 @@
  * 'public', DB2 defaults to empty.
  *
  * encoding =>
- * For MySQL, MySQLi, Postgres and DB2, specifies the character encoding to use when connecting to the
+ * For MySQL, Postgres and DB2, specifies the character encoding to use when connecting to the
  * database.  Uses database default.
  *
  */

diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -226,7 +226,6 @@ function testGetSourceName() {
 	function testLoadDataSource() {
 		$connections = array(
 			array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql'),
-			array('classname' => 'DboMysqli', 'filename' => 'dbo' . DS . 'dbo_mysqli'),
 			array('classname' => 'DboMssql', 'filename' => 'dbo' . DS . 'dbo_mssql'),
 			array('classname' => 'DboOracle', 'filename' => 'dbo' . DS . 'dbo_oracle'),
 		);