From f6cd45ccb9f8825eb44dd2fa736c7aa0082ff98c Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Fri, 18 Jan 2008 14:31:51 +0000
Subject: fix for count_all

---
 system/database/drivers/mssql/mssql_driver.php     | 4 ++--
 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       | 4 ++--
 system/database/drivers/postgre/postgre_driver.php | 4 +---
 system/database/drivers/sqlite/sqlite_driver.php   | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index 06a508e71..71d6c4276 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -297,8 +297,8 @@ class CI_DB_mssql_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query($this->_count_string . "FROM ".$this->dbprefix.$table);
-		
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
+
 		if ($query->num_rows() == 0)
 			return '0';
 
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 36e365165..9ba37b452 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -312,7 +312,7 @@ class CI_DB_mysql_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`");
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 		
 		if ($query->num_rows() == 0)
 			return '0';
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 94a29937b..e548fb054 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -306,7 +306,7 @@ class CI_DB_mysqli_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`");
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 		
 		if ($query->num_rows() == 0)
 			return '0';
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 160a56d51..56095e922 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -413,7 +413,7 @@ class CI_DB_oci8_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 
-		$query = $this->query($this->_count_string . "FROM ".$table);
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 
 		if ($query == FALSE)
 			{
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index c5c582d0b..03f58e261 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -281,8 +281,8 @@ class CI_DB_odbc_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`");
-		
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
+	
 		if ($query->num_rows() == 0)
 			return '0';
 
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index fa27f03d5..8ea76033c 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -302,9 +302,7 @@ class CI_DB_postgre_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 
-		$query = $this->query($this->_count_string .'FROM "'.$this->dbprefix.$table.'"');
-//		original query before _count_string was used.  Kept for reference
-//		$query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"');
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 				
 		if ($query->num_rows() == 0)
 			return '0';
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 110b208d2..31b29289f 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -298,7 +298,7 @@ class CI_DB_sqlite_driver extends CI_DB {
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`");
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 		
 		if ($query->num_rows() == 0)
 			return '0';
-- 
cgit v1.2.3-24-g4f1b