From 5aa8c60392a89140448691b838a90b7d1c644774 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Tue, 7 Oct 2008 01:24:07 +0000
Subject: Explicitly added driver name variable in each DB driver, based on
 this bug report: #4436

---
 system/database/drivers/mssql/mssql_driver.php     | 3 ++-
 system/database/drivers/mysql/mysql_driver.php     | 2 ++
 system/database/drivers/mysqli/mysqli_driver.php   | 2 ++
 system/database/drivers/oci8/oci8_driver.php       | 2 ++
 system/database/drivers/odbc/odbc_driver.php       | 2 ++
 system/database/drivers/postgre/postgre_driver.php | 2 ++
 system/database/drivers/sqlite/sqlite_driver.php   | 2 ++
 7 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index ed6eadbf8..02b975ad2 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -37,7 +37,8 @@ class CI_DB_mssql_driver extends CI_DB {
 	 */
 	var $_count_string = "SELECT COUNT(*) AS ";
 	var $_random_keyword = ' ASC'; // not currently supported
-	
+	var $dbdriver		= 'mssql';
+
 	/**
 	 * Non-persistent database connection
 	 *
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 52df1e591..db04c6de8 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -30,6 +30,8 @@
  */
 class CI_DB_mysql_driver extends CI_DB {
 
+	var $dbdriver = 'mysql';
+
 	/**
 	 * Whether to use the MySQL "delete hack" which allows the number
 	 * of affected rows to be shown. Uses a preg_replace when enabled,
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 35a7fc077..a5d104cc2 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -30,6 +30,8 @@
  */
 class CI_DB_mysqli_driver extends CI_DB {
 
+	var $dbdriver = 'mysqli';
+
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 96a6a1352..006e6ef1f 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -43,6 +43,8 @@
 
 class CI_DB_oci8_driver extends CI_DB {
 
+	var $dbdriver = 'oci8';
+
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 29928807b..cc8d3347b 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -30,6 +30,8 @@
  */
 class CI_DB_odbc_driver extends CI_DB {
 
+	var $dbdriver = 'odbc';
+
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index aada164d0..c5c70a736 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -30,6 +30,8 @@
  */
 class CI_DB_postgre_driver extends CI_DB {
 
+	var $dbdriver = 'postgre';
+
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 782156949..df19dba78 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -32,6 +32,8 @@
  */
 class CI_DB_sqlite_driver extends CI_DB {
 
+	var $dbdriver = 'sqlite';
+
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
-- 
cgit v1.2.3-24-g4f1b