Removing Oracle driver, it will not make it to stable release. Revert…

… this commit to bring it back for next version
cakephp · Sep 3, 2011 · 89b1e54 · 89b1e54
1 parent 85d9b1a
commit 89b1e54
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 1,250 deletions.
diff --git a/app/Config/database.php.default b/app/Config/database.php.default
@@ -31,8 +31,7 @@
  *		Database/Mysql 		- MySQL 4 & 5,
  *		Database/Sqlite		- SQLite (PHP5 only),
  *		Database/Postgres	- PostgreSQL 7 and higher,
- *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher,
- *		Database/Oracle		- Oracle 8 and higher
+ *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher
  *
  * You can add custom database drivers (or override existing drivers) by adding the
  * appropriate file to app/Model/Datasource/Database.  Drivers should be named 'MyDriver.php',

diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -104,7 +104,7 @@ protected function _interactive() {
 				}
 			}
 
-			$driver = $this->in(__d('cake_console', 'Driver:'), array('Mysql', 'Oracle', 'Postgres', 'Sqlite', 'Sqlserver'), 'Mysql');
+			$driver = $this->in(__d('cake_console', 'Driver:'), array('Mysql', 'Postgres', 'Sqlite', 'Sqlserver'), 'Mysql');
 
 			$persistent = $this->in(__d('cake_console', 'Persistent Connection?'), array('y', 'n'), 'n');
 			if (strtolower($persistent) == 'n') {

diff --git a/lib/Cake/Console/Templates/skel/Config/database.php.default b/lib/Cake/Console/Templates/skel/Config/database.php.default
@@ -31,8 +31,7 @@
  *		Database/Mysql 		- MySQL 4 & 5,
  *		Database/Sqlite		- SQLite (PHP5 only),
  *		Database/Postgres	- PostgreSQL 7 and higher,
- *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher,
- *		Database/Oracle		- Oracle 8 and higher
+ *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher
  *
  * You can add custom database drivers (or override existing drivers) by adding the
  * appropriate file to app/Model/Datasource/Database.  Drivers should be named 'MyDriver.php',