From e808aac2627c35d50082f814d9778c4bf976011c Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 6 Apr 2008 18:22:00 +0000
Subject: Added the ability to prevent escaping in having() clauses.

---
 system/database/DB_active_rec.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'system/database/DB_active_rec.php')

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index bde43abf0..23a5a7adf 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -775,9 +775,9 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * @param	string
 	 * @return	object
 	 */
-	function having($key, $value = '')
+	function having($key, $value = '', $escape = TRUE)
 	{
-		return $this->_having($key, $value, 'AND ');
+		return $this->_having($key, $value, 'AND ', $escape);
 	}
 
 	// --------------------------------------------------------------------
@@ -788,9 +788,9 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * orhaving() has been deprecated
 	 */
 
-	function orhaving($key, $value = '')
+	function orhaving($key, $value = '', $escape = TRUE)
 	{
-		return $this->or_having($key, $value = '');
+		return $this->or_having($key, $value = '', $escape);
 	}	
 	// --------------------------------------------------------------------
 
@@ -804,9 +804,9 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * @param	string
 	 * @return	object
 	 */
-	function or_having($key, $value = '')
+	function or_having($key, $value = '', $escape = TRUE)
 	{
-		return $this->_having($key, $value, 'OR ');
+		return $this->_having($key, $value, 'OR ', $escape);
 	}
 	
 	// --------------------------------------------------------------------
@@ -822,7 +822,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * @param	string
 	 * @return	object
 	 */
-	function _having($key, $value = '', $type = 'AND ')
+	function _having($key, $value = '', $type = 'AND ', $escape = TRUE)
 	{
 		if ( ! is_array($key))
 		{
@@ -832,7 +832,12 @@ class CI_DB_active_record extends CI_DB_driver {
 		foreach ($key as $k => $v)
 		{
 			$prefix = (count($this->ar_having) == 0) ? '' : $type;
-			$k = $this->_protect_identifiers($k);
+
+			if ($escape === TRUE)
+			{
+				$k = $this->_protect_identifiers($k);
+			}
+
 			
 			if ($v != '')
 			{
-- 
cgit v1.2.3-24-g4f1b