From 42113449a6942236236bab80328e6dc541a32585 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 29 Jul 2013 09:55:29 +0300
Subject: Fix #2568

---
 system/database/drivers/pdo/pdo_driver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index fa89661b1..184a8df33 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -69,7 +69,7 @@ class CI_DB_pdo_driver extends CI_DB {
 	{
 		parent::__construct($params);
 
-		if (preg_match('/([^;]+):/', $this->dsn, $match) && count($match) === 2)
+		if (preg_match('/([^:]+):/', $this->dsn, $match) && count($match) === 2)
 		{
 			// If there is a minimum valid dsn string pattern found, we're done
 			// This is for general PDO users, who tend to have a full DSN string.
@@ -77,7 +77,7 @@ class CI_DB_pdo_driver extends CI_DB {
 			return;
 		}
 		// Legacy support for DSN specified in the hostname field
-		elseif (preg_match('/([^;]+):/', $this->hostname, $match) && count($match) === 2)
+		elseif (preg_match('/([^:]+):/', $this->hostname, $match) && count($match) === 2)
 		{
 			$this->dsn = $this->hostname;
 			$this->hostname = NULL;
-- 
cgit v1.2.3-24-g4f1b


From 79f888b27bd67724b30aa6dd30e2ae5162b1fea8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 6 Aug 2013 13:59:23 +0300
Subject: Fix #2501 & another -related bug

---
 system/database/DB_driver.php        | 4 +++-
 system/database/DB_query_builder.php | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 425657e17..53decf014 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1375,7 +1375,9 @@ abstract class CI_DB_driver {
 			$fields[$this->protect_identifiers($key)] = $this->escape($val);
 		}
 
-		return $this->_update($this->protect_identifiers($table, TRUE, NULL, FALSE), $fields);
+		$sql = $this->_update($this->protect_identifiers($table, TRUE, NULL, FALSE), $fields);
+		$this->_reset_write();
+		return $sql;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 292621b66..355613c6f 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1846,6 +1846,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			$this->query($this->_update_batch($this->protect_identifiers($table, TRUE, NULL, FALSE), array_slice($this->qb_set, $i, 100), $this->protect_identifiers($index)));
 			$affected_rows += $this->affected_rows();
+			$this->qb_where = array();
 		}
 
 		$this->_reset_write();
-- 
cgit v1.2.3-24-g4f1b


From 5b55c15f24b518aa4775a0c15382c7b4bf72e1bc Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 6 Aug 2013 14:14:32 +0300
Subject: Fix #2585

---
 system/database/DB_query_builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 355613c6f..e6a108209 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -385,7 +385,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			$alias = $this->_create_alias_from_table(trim($select));
 		}
 
-		$sql = $this->protect_identifiers($type.'('.trim($select).')').' AS '.$this->escape_identifiers(trim($alias));
+		$sql = $type.'('.$this->protect_identifiers(trim($select)).') AS '.$this->escape_identifiers(trim($alias));
 
 		$this->qb_select[] = $sql;
 		$this->qb_no_escape[] = NULL;
-- 
cgit v1.2.3-24-g4f1b


From c941d855dc32ec44107cb863596fa385c7aed015 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 6 Aug 2013 14:44:40 +0200
Subject: Various typos and tabs adjustments

---
 system/database/drivers/oci8/oci8_driver.php | 2 +-
 system/database/drivers/oci8/oci8_result.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 93e62b4dd..020a3a4ba 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright   Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index fd1d28787..ce09b62bc 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright   Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From e6c4d5bcd1a65cfa2397457a6de771dc45800bfb Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 8 Sep 2013 13:54:57 +0200
Subject: Code cleanup in db->order_by()

---
 system/database/DB_query_builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index e6a108209..b7b568b10 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1152,7 +1152,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 
 			// Do we have a seed value?
 			$orderby = ctype_digit((string) $orderby)
-				? $orderby = sprintf($this->_random_keyword[1], $orderby)
+				? sprintf($this->_random_keyword[1], $orderby)
 				: $this->_random_keyword[0];
 		}
 		elseif (empty($orderby))
-- 
cgit v1.2.3-24-g4f1b


From 9f8e29913996168971cb690fd319bdd0eaa6c29a Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 8 Sep 2013 14:05:04 +0200
Subject: Adjust a few phpdoc in query builder code

---
 system/database/DB_query_builder.php                        | 2 +-
 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 2 +-
 system/database/drivers/postgre/postgre_driver.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index e6a108209..fb314e559 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1138,7 +1138,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 	 * ORDER BY
 	 *
 	 * @param	string	$orderby
-	 * @param	string	$direction	ASC or DESC
+	 * @param	string	$direction	ASC, DESC or RANDOM
 	 * @param	bool	$escape
 	 * @return	CI_DB_query_builder
 	 */
diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index d0cdde2e2..83daee9f6 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -166,7 +166,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
 	 * ORDER BY
 	 *
 	 * @param	string	$orderby
-	 * @param	string	$direction	ASC or DESC
+	 * @param	string	$direction	ASC, DESC or RANDOM
 	 * @param	bool	$escape
 	 * @return	object
 	 */
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index ac7345ad6..f24db46b4 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -512,7 +512,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 * ORDER BY
 	 *
 	 * @param	string	$orderby
-	 * @param	string	$direction	ASC or DESC
+	 * @param	string	$direction	ASC, DESC or RANDOM
 	 * @param	bool	$escape
 	 * @return	object
 	 */
-- 
cgit v1.2.3-24-g4f1b


From 4013be3d0953612ce081802bb6cc331338d8f58a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 10 Sep 2013 19:31:04 +0300
Subject: Add support for UPDATE ... RETURNING statements in PostgreSQL

An improved version of PR #2629.
Also removes REPLACE from the regular expression, as it is not supported by PostgreSQL.
---
 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 2 +-
 system/database/drivers/postgre/postgre_driver.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index 83daee9f6..285fca514 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -137,7 +137,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index f24db46b4..010518ed3 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -318,7 +318,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 2d54a3a90164ede4fdaafc7f81e6bba6045a8727 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 11 Sep 2013 14:59:10 +0300
Subject: Really fix #2490, rel: #2629

---
 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 2 +-
 system/database/drivers/postgre/postgre_driver.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index 285fca514..fda3f238b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -137,7 +137,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 010518ed3..dbf7c6b95 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -318,7 +318,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 3c5ec85c6a6303dfed8cefbbb77f5ce7571967bb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 13 Sep 2013 15:01:08 +0300
Subject: Update MySQLi to use the PHP API for transactions, where possible

---
 system/database/drivers/mysqli/mysqli_driver.php | 27 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index ef2cb8a8d..0f3c6fc62 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -241,9 +241,10 @@ class CI_DB_mysqli_driver extends CI_DB {
 		// even if the queries produce a successful result.
 		$this->_trans_failure = ($test_mode === TRUE);
 
-		$this->simple_query('SET AUTOCOMMIT=0');
-		$this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK
-		return TRUE;
+		$this->conn_id->autocommit(FALSE);
+		return is_php('5.5')
+			? $this->conn_id->begin_transaction()
+			: $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK
 	}
 
 	// --------------------------------------------------------------------
@@ -261,9 +262,13 @@ class CI_DB_mysqli_driver extends CI_DB {
 			return TRUE;
 		}
 
-		$this->simple_query('COMMIT');
-		$this->simple_query('SET AUTOCOMMIT=1');
-		return TRUE;
+		if ($this->conn_id->commit())
+		{
+			$this->conn_id->autocommit(TRUE);
+			return TRUE;
+		}
+
+		return FALSE;
 	}
 
 	// --------------------------------------------------------------------
@@ -281,9 +286,13 @@ class CI_DB_mysqli_driver extends CI_DB {
 			return TRUE;
 		}
 
-		$this->simple_query('ROLLBACK');
-		$this->simple_query('SET AUTOCOMMIT=1');
-		return TRUE;
+		if ($this->conn_id->rollback())
+		{
+			$this->conn_id->autocommit(TRUE);
+			return TRUE;
+		}
+
+		return FALSE;
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From a9346aa754f5488f7535f580dd744477f52d5063 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 13 Sep 2013 16:03:07 +0300
Subject: Fix a PostgreSQL string escaping bug and use pg_escape_literal() when
 possible

---
 system/database/drivers/postgre/postgre_driver.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index dbf7c6b95..b72fb873a 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -331,7 +331,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */
 	protected function _escape_str($str)
 	{
-		return pg_escape_string($str);
+		return pg_escape_string($this->conn_id, $str);
 	}
 
 	// --------------------------------------------------------------------
@@ -346,7 +346,11 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */
 	public function escape($str)
 	{
-		if (is_bool($str))
+		if (is_php('5.4.4') && (is_string($str) OR (is_object($str) && method_exists($str, '__toString'))))
+		{
+			return pg_escape_literal($this->conn_id, $str);
+		}
+		elseif (is_bool($str))
 		{
 			return ($str) ? 'TRUE' : 'FALSE';
 		}
-- 
cgit v1.2.3-24-g4f1b


From 3a3d5f6c2320a90436de241af41fe22df7344728 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Thu, 17 Oct 2013 22:22:16 +0200
Subject: Replace the last rand() with mt_rand()

Better entropy, faster.
Also fixed a few "it's" typos.
---
 system/database/DB_driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 53decf014..618f3660c 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1135,7 +1135,7 @@ abstract class CI_DB_driver {
 				else
 				{
 					/* We have no other choice but to just get the first element's key.
-					 * Due to array_shift() accepting it's argument by reference, if
+					 * Due to array_shift() accepting its argument by reference, if
 					 * E_STRICT is on, this would trigger a warning. So we'll have to
 					 * assign it first.
 					 */
-- 
cgit v1.2.3-24-g4f1b


From 6c85442746c46009cdf3fe517465e174a91cc4c5 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 21 Oct 2013 13:58:15 +0300
Subject: Fix #2691

---
 system/database/DB_driver.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 618f3660c..9aa6c5de5 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -624,7 +624,14 @@ abstract class CI_DB_driver {
 				// if transactions are enabled. If we don't call this here
 				// the error message will trigger an exit, causing the
 				// transactions to remain in limbo.
-				$this->_trans_depth > 0 && $this->trans_complete();
+				if ($this->_trans_depth !== 0)
+				{
+					do
+					{
+						$this->trans_complete();
+					}
+					while ($this->_trans_depth !== 0);
+				}
 
 				// Display errors
 				return $this->display_error(array('Error Number: '.$error['code'], $error['message'], $sql));
-- 
cgit v1.2.3-24-g4f1b


From 8adac96fdc90cfc8c667d64b95ae29845808947b Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 28 Oct 2013 14:13:09 +0200
Subject: Fix CI_DB_query_builder::_merge_cache() triggering E_WARNINGs

Kudos to kakysha for noting the bug & providing initial fix in PR #2698
---
 system/database/DB_query_builder.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index a36501eb6..95c3af3a9 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2551,11 +2551,13 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			$qb_variable	= 'qb_'.$val;
 			$qb_cache_var	= 'qb_cache_'.$val;
 
-			if (count($this->$qb_cache_var) === 0)
+			if (count($this->$qb_cache_var) > 0)
 			{
-				continue;
+				foreach ($this->$qb_cache_var as &$cache_var)
+				{
+					in_array($cache_var, $this->$qb_variable, TRUE) OR $this->$qb_variable[] = $cache_var;
+				}
 			}
-			$this->$qb_variable = array_merge($this->$qb_variable, array_diff($this->$qb_cache_var, $this->$qb_variable));
 		}
 
 		// If we are "protecting identifiers" we need to examine the "from"
-- 
cgit v1.2.3-24-g4f1b


From 710c4ed57e916714b04bec079b03cb47621ec393 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 28 Oct 2013 14:37:24 +0200
Subject: Fixing the dumbest parser error ever

---
 system/database/DB_query_builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 95c3af3a9..ebc9855bc 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2555,7 +2555,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			{
 				foreach ($this->$qb_cache_var as &$cache_var)
 				{
-					in_array($cache_var, $this->$qb_variable, TRUE) OR $this->$qb_variable[] = $cache_var;
+					in_array($cache_var, $this->$qb_variable, TRUE) OR $this->{$qb_variable}[] = $cache_var;
 				}
 			}
 		}
-- 
cgit v1.2.3-24-g4f1b


From 5d69a6e8e096faa99fb838dabd7fe548213b0f26 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 28 Oct 2013 15:34:47 +0200
Subject: Fix #2703

---
 system/database/DB_forge.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index d52029ecd..f156d24eb 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -740,6 +740,18 @@ abstract class CI_DB_forge {
 					'_literal'		=> FALSE
 			);
 
+			if ($create_table === FALSE)
+			{
+				if (isset($attributes['AFTER']))
+				{
+					$field['after'] = $attributes['after'];
+				}
+				elseif (isset($attributes['FIRST']))
+				{
+					$field['first'] = (bool) $attributes['FIRST'];
+				}
+			}
+
 			$this->_attr_default($attributes, $field);
 
 			if (isset($attributes['NULL']))
@@ -748,11 +760,15 @@ abstract class CI_DB_forge {
 				{
 					$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
 				}
-				elseif ($create_table === TRUE)
+				else
 				{
 					$field['null'] = ' NOT NULL';
 				}
 			}
+			elseif ($create_table === TRUE)
+			{
+				$field['null'] = ' NOT NULL';
+			}
 
 			$this->_attr_auto_increment($attributes, $field);
 			$this->_attr_unique($attributes, $field);
-- 
cgit v1.2.3-24-g4f1b


From 96185a3a0edcc27fa0af6df761d6353a2208ea9d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 28 Oct 2013 16:04:02 +0200
Subject: Really fix #2703

---
 system/database/DB_forge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index f156d24eb..92806d305 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -744,7 +744,7 @@ abstract class CI_DB_forge {
 			{
 				if (isset($attributes['AFTER']))
 				{
-					$field['after'] = $attributes['after'];
+					$field['after'] = $attributes['AFTER'];
 				}
 				elseif (isset($attributes['FIRST']))
 				{
-- 
cgit v1.2.3-24-g4f1b


From 5e3d48c21dea8a97dcea1b820ebc14700a336312 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 29 Oct 2013 14:36:18 +0200
Subject: Fix a bug when multiple calls to QB's _compile_wh() or
 _compile_group_by() are required

---
 system/database/DB_query_builder.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index ebc9855bc..a73460394 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2291,7 +2291,12 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			for ($i = 0, $c = count($this->$qb_key); $i < $c; $i++)
 			{
-				if ($this->{$qb_key}[$i]['escape'] === FALSE)
+				// Is this condition already compiled?
+				if (is_string($this->{$qb_key}[$i]))
+				{
+					continue;
+				}
+				elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
 				{
 					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'];
 					continue;
@@ -2361,6 +2366,12 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			for ($i = 0, $c = count($this->qb_groupby); $i < $c; $i++)
 			{
+				// Is it already compiled?
+				if (is_string($this->qb_groupby))
+				{
+					continue;
+				}
+
 				$this->qb_groupby[$i] = ($this->qb_groupby[$i]['escape'] === FALSE OR $this->_is_literal($this->qb_groupby[$i]['field']))
 					? $this->qb_groupby[$i]['field']
 					: $this->protect_identifiers($this->qb_groupby[$i]['field']);
-- 
cgit v1.2.3-24-g4f1b


From e1b8683d7983cca11219d618f093b842429bd41c Mon Sep 17 00:00:00 2001
From: GDmac <grdalenoort@gmail.com>
Date: Fri, 8 Nov 2013 16:52:54 +0100
Subject: Fix #2406 query builder cache

Signed-off-by: GDmac <grdalenoort@gmail.com>
---
 system/database/DB_query_builder.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index a73460394..0d0421306 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2557,18 +2557,22 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			return;
 		}
 
-		foreach ($this->qb_cache_exists as $val)
+		$parts = array_unique($this->qb_cache_exists); // select, from, etc.
+
+		foreach ($parts as $val)
 		{
 			$qb_variable	= 'qb_'.$val;
 			$qb_cache_var	= 'qb_cache_'.$val;
 
-			if (count($this->$qb_cache_var) > 0)
+			$qb_new = $this->$qb_cache_var;
+
+			foreach ($this->$qb_variable as $qb_var)
 			{
-				foreach ($this->$qb_cache_var as &$cache_var)
-				{
-					in_array($cache_var, $this->$qb_variable, TRUE) OR $this->{$qb_variable}[] = $cache_var;
-				}
+			 	in_array($qb_var, $qb_new, TRUE) OR $qb_new[] = $qb_var;
 			}
+			
+			$this->$qb_variable = $qb_new;
+
 		}
 
 		// If we are "protecting identifiers" we need to examine the "from"
-- 
cgit v1.2.3-24-g4f1b


From 17a0528c23c4d6cf95b03299fbfe2ff789b82249 Mon Sep 17 00:00:00 2001
From: GDmac <grdalenoort@gmail.com>
Date: Mon, 11 Nov 2013 13:18:09 +0100
Subject: Cleanup PR #2719

for Fix #2406 query builder cache

Signed-off-by: GDmac <grdalenoort@gmail.com>
---
 system/database/DB_query_builder.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 0d0421306..fb8514f5c 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2557,22 +2557,19 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			return;
 		}
 
-		$parts = array_unique($this->qb_cache_exists); // select, from, etc.
-
-		foreach ($parts as $val)
+		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
 		{
 			$qb_variable	= 'qb_'.$val;
 			$qb_cache_var	= 'qb_cache_'.$val;
 
 			$qb_new = $this->$qb_cache_var;
 
-			foreach ($this->$qb_variable as $qb_var)
+			foreach ($this->$qb_variable as &$qb_var)
 			{
 			 	in_array($qb_var, $qb_new, TRUE) OR $qb_new[] = $qb_var;
 			}
 			
 			$this->$qb_variable = $qb_new;
-
 		}
 
 		// If we are "protecting identifiers" we need to examine the "from"
-- 
cgit v1.2.3-24-g4f1b


From 35e3b0bc4f723b938160da87aeb5ad9e054507c4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 12 Nov 2013 16:07:08 +0200
Subject: [ci skip] Remove some whitespace chars

---
 system/database/DB_query_builder.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index fb8514f5c..f0fe96c35 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2561,14 +2561,13 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			$qb_variable	= 'qb_'.$val;
 			$qb_cache_var	= 'qb_cache_'.$val;
-
-			$qb_new = $this->$qb_cache_var;
+			$qb_new 	= $this->$qb_cache_var;
 
 			foreach ($this->$qb_variable as &$qb_var)
 			{
 			 	in_array($qb_var, $qb_new, TRUE) OR $qb_new[] = $qb_var;
 			}
-			
+
 			$this->$qb_variable = $qb_new;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From c6ac748cfee049f2f456ce962bd1944e19237509 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 17 Nov 2013 00:50:06 +0100
Subject: Small docblock fix

---
 system/database/DB_query_builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index f0fe96c35..1d41a19ba 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1338,7 +1338,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 	 * returned by an Query Builder query.
 	 *
 	 * @param	string
-	 * @return	string
+	 * @return	int
 	 */
 	public function count_all_results($table = '')
 	{
-- 
cgit v1.2.3-24-g4f1b


From 3ca060a00e5039aa00d4180ded52b1af49939114 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 27 Nov 2013 16:30:31 +0200
Subject: [ci skip] Remove a few more spaces

---
 system/database/drivers/oci8/oci8_driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 020a3a4ba..d75ed28cc 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -344,7 +344,7 @@ class CI_DB_oci8_driver extends CI_DB {
 				$have_cursor = TRUE;
 			}
 		}
-		$sql = trim($sql, ',') . '); END;';
+		$sql = trim($sql, ',').'); END;';
 
 		$this->stmt_id = FALSE;
 		$this->_set_stmt_id($sql);
-- 
cgit v1.2.3-24-g4f1b


From f8f14f3da263338bb4723012229f6c373a1764c6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 10 Dec 2013 11:32:32 +0200
Subject: Fix a bug where DB() tried to set the MySQL-specific 'sql_mode' on
 all drivers

Supersedes PR #2756
---
 system/database/DB.php                              |  5 -----
 system/database/drivers/mysql/mysql_driver.php      | 14 ++++++++++++++
 system/database/drivers/mysqli/mysqli_driver.php    | 14 ++++++++++++++
 .../drivers/pdo/subdrivers/pdo_mysql_driver.php     | 21 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB.php b/system/database/DB.php
index 8742800c8..96da87c6d 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -206,11 +206,6 @@ function &DB($params = '', $query_builder_override = NULL)
 		$DB->initialize();
 	}
 
-	if ( ! empty($params['stricton']))
-	{
-		$DB->query('SET SESSION sql_mode="STRICT_ALL_TABLES"');
-	}
-
 	return $DB;
 }
 
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index b94642b35..16b2f6f53 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -66,6 +66,15 @@ class CI_DB_mysql_driver extends CI_DB {
 	 */
 	public $delete_hack = TRUE;
 
+	/**
+	 * Strict ON flag
+	 *
+	 * Whether we're running in strict SQL mode.
+	 *
+	 * @var	bool
+	 */
+	public $stricton = FALSE;
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -126,6 +135,11 @@ class CI_DB_mysql_driver extends CI_DB {
 				: FALSE;
 		}
 
+		if ($this->stricton && is_resource($this->conn_id))
+		{
+			$this->simple_query('SET SESSION sql_mode="STRICT_ALL_TABLES"');
+		}
+
 		return $this->conn_id;
 	}
 
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 0f3c6fc62..62ba2c50d 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -66,6 +66,15 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 */
 	public $delete_hack = TRUE;
 
+	/**
+	 * Strict ON flag
+	 *
+	 * Whether we're running in strict SQL mode.
+	 *
+	 * @var	bool
+	 */
+	public $stricton = FALSE;
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -93,6 +102,11 @@ class CI_DB_mysqli_driver extends CI_DB {
 		$client_flags = ($this->compress === TRUE) ? MYSQLI_CLIENT_COMPRESS : 0;
 		$mysqli = mysqli_init();
 
+		if ($this->stricton)
+		{
+			$mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode="STRICT_ALL_TABLES"');
+		}
+
 		return @$mysqli->real_connect($hostname, $this->username, $this->password, $this->database, $port, NULL, $client_flags)
 			? $mysqli : FALSE;
 	}
diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
index ff486fc5a..bc92cab83 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
@@ -55,6 +55,15 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver {
 	 */
 	public $compress = FALSE;
 
+	/**
+	 * Strict ON flag
+	 *
+	 * Whether we're running in strict SQL mode.
+	 *
+	 * @var	bool
+	 */
+	public $stricton = FALSE;
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -114,6 +123,18 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver {
 				.(empty($this->dbcollat) ? '' : ' COLLATE '.$this->dbcollat);
 		}
 
+		if ($this->stricton)
+		{
+			if (empty($this->options[PDO::MYSQL_ATTR_INIT_COMMAND]))
+			{
+				$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET SESSION sql_mode="STRICT_ALL_TABLES"';
+			}
+			else
+			{
+				$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] .= ', @@session.sql_mode = "STRICT_ALL_TABLES"';
+			}
+		}
+
 		if ($this->compress === TRUE)
 		{
 			$this->options[PDO::MYSQL_ATTR_COMPRESS] = TRUE;
-- 
cgit v1.2.3-24-g4f1b


From a3f91b9e16ec70a079b8489ffc6a7ff310b35986 Mon Sep 17 00:00:00 2001
From: Kakysha <ezhikvdele@gmail.com>
Date: Sat, 14 Dec 2013 05:23:23 +0400
Subject: DB call_function() bug : funny typo -or- smart autocomplete?

---
 system/database/DB_driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 9aa6c5de5..72be14e4b 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1483,7 +1483,7 @@ abstract class CI_DB_driver {
 		}
 
 		return (func_num_args() > 1)
-			? call_user_func_array($function, array_splice(func_get_args(), 1))
+			? call_user_func_array($function, array_slice(func_get_args(), 1))
 			: call_user_func($function);
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 225c37315bdaa05371cd3142dda25783f4cca8af Mon Sep 17 00:00:00 2001
From: mjnaderi <mjnaderi@gmail.com>
Date: Thu, 19 Dec 2013 00:35:08 +0330
Subject: Cleanup DB_forge _process_indexes

---
 system/database/DB_forge.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 92806d305..bde4e2872 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -984,7 +984,6 @@ abstract class CI_DB_forge {
 	 */
 	protected function _process_indexes($table)
 	{
-		$table = $this->db->escape_identifiers($table);
 		$sqls = array();
 
 		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
-- 
cgit v1.2.3-24-g4f1b


From 18c2e0c7d75ae91d0223bccf41d07e5a42626cd4 Mon Sep 17 00:00:00 2001
From: mjnaderi <mjnaderi@gmail.com>
Date: Thu, 19 Dec 2013 01:16:17 +0330
Subject: Cleanup DB_forge _process_indexes

---
 system/database/DB_forge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index bde4e2872..bec8d5554 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -984,6 +984,7 @@ abstract class CI_DB_forge {
 	 */
 	protected function _process_indexes($table)
 	{
+		$table = $this->db->escape_identifiers($table);
 		$sqls = array();
 
 		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
@@ -1008,7 +1009,7 @@ abstract class CI_DB_forge {
 			is_array($this->keys[$i]) OR $this->keys[$i] = array($this->keys[$i]);
 
 			$sqls[] = 'CREATE INDEX '.$this->db->escape_identifiers(implode('_', $this->keys[$i]))
-				.' ON '.$this->db->escape_identifiers($table)
+				.' ON '.$table
 				.' ('.implode(', ', $this->db->escape_identifiers($this->keys[$i])).');';
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From d3a6ca207f5851852a4d0de7c70c861434f70c5c Mon Sep 17 00:00:00 2001
From: mjnaderi <mjnaderi@gmail.com>
Date: Thu, 19 Dec 2013 01:35:57 +0330
Subject: Use table name as a prefix for index names

---
 system/database/DB_forge.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index bec8d5554..1cebb189c 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -984,7 +984,6 @@ abstract class CI_DB_forge {
 	 */
 	protected function _process_indexes($table)
 	{
-		$table = $this->db->escape_identifiers($table);
 		$sqls = array();
 
 		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
@@ -1008,8 +1007,8 @@ abstract class CI_DB_forge {
 
 			is_array($this->keys[$i]) OR $this->keys[$i] = array($this->keys[$i]);
 
-			$sqls[] = 'CREATE INDEX '.$this->db->escape_identifiers(implode('_', $this->keys[$i]))
-				.' ON '.$table
+			$sqls[] = 'CREATE INDEX '.$this->db->escape_identifiers($table.'_'.implode('_', $this->keys[$i]))
+				.' ON '.$this->db->escape_identifiers($table)
 				.' ('.implode(', ', $this->db->escape_identifiers($this->keys[$i])).');';
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 72109068e391d67729d92d23ca47bd6373e64363 Mon Sep 17 00:00:00 2001
From: Tufan Barış YILDIRIM <tufanbarisyildirim@gmail.com>
Date: Thu, 19 Dec 2013 19:48:00 +0200
Subject: EXISTS / NOT EXISTS clause support for  DB_query_builder.

---
 system/database/DB_driver.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 72be14e4b..3c30c659c 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1421,7 +1421,7 @@ abstract class CI_DB_driver {
 	 */
 	protected function _has_operator($str)
 	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
 	}
 
 	// --------------------------------------------------------------------
@@ -1446,7 +1446,9 @@ abstract class CI_DB_driver {
 				'\s*<>?\s*',			// <, <>
 				'\s*>\s*',			// >
 				'\s+IS NULL',			// IS NULL
-				'\s+IS NOT NULL',		// IS NOT NULL
+                '\s+IS NOT NULL',        // IS NOT NULL
+                '\s+EXISTS',        // EXISTS
+				'\s+NOT EXISTS',		// NOT EXISTS
 				'\s+BETWEEN\s+\S+\s+AND\s+\S+',	// BETWEEN value AND value
 				'\s+IN\s*\([^\)]+\)',		// IN(list)
 				'\s+NOT IN\s*\([^\)]+\)',	// NOT IN (list)
-- 
cgit v1.2.3-24-g4f1b


From 0f0e6adee7d3edf45fbadf5ec01505a46d70760d Mon Sep 17 00:00:00 2001
From: Tufan Barış YILDIRIM <tufanbarisyildirim@gmail.com>
Date: Thu, 19 Dec 2013 19:48:00 +0200
Subject: EXISTS / NOT EXISTS clause support for  DB_driver

---
 system/database/DB_driver.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 72be14e4b..ec3de7e6e 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1421,7 +1421,7 @@ abstract class CI_DB_driver {
 	 */
 	protected function _has_operator($str)
 	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
 	}
 
 	// --------------------------------------------------------------------
@@ -1446,7 +1446,9 @@ abstract class CI_DB_driver {
 				'\s*<>?\s*',			// <, <>
 				'\s*>\s*',			// >
 				'\s+IS NULL',			// IS NULL
-				'\s+IS NOT NULL',		// IS NOT NULL
+                '\s+IS NOT NULL',        // IS NOT NULL
+                '\s+EXISTS',        // EXISTS
+                '\s+NOT EXISTS',		// NOT EXISTS
 				'\s+BETWEEN\s+\S+\s+AND\s+\S+',	// BETWEEN value AND value
 				'\s+IN\s*\([^\)]+\)',		// IN(list)
 				'\s+NOT IN\s*\([^\)]+\)',	// NOT IN (list)
-- 
cgit v1.2.3-24-g4f1b


From 30893b901b9e91c013f86ef733407e17ea084d4c Mon Sep 17 00:00:00 2001
From: Tufan Barış YILDIRIM <tufanbarisyildirim@gmail.com>
Date: Thu, 19 Dec 2013 21:30:56 +0200
Subject: changed EXISTS / NOT EXISTS pattern @narfbg "It has parenthesis, so
 use the IN / NOT IN pattern as a base."

---
 system/database/DB_driver.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index ffee74df7..33903434c 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1421,7 +1421,7 @@ abstract class CI_DB_driver {
 	 */
 	protected function _has_operator($str)
 	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
 	}
 
 	// --------------------------------------------------------------------
@@ -1447,8 +1447,8 @@ abstract class CI_DB_driver {
 				'\s*>\s*',			// >
 				'\s+IS NULL',			// IS NULL
 				'\s+IS NOT NULL',	// IS NOT NULL
-				'\s+EXISTS',	// EXISTS
-				'\s+NOT EXISTS',		// NOT EXISTS
+				'\s+EXISTS\s*\([^\)]+\)',	// EXISTS(sql)
+				'\s+NOT EXISTS\s*\([^\)]+\)',		// NOT EXISTS(sql)
 				'\s+BETWEEN\s+\S+\s+AND\s+\S+',	// BETWEEN value AND value
 				'\s+IN\s*\([^\)]+\)',		// IN(list)
 				'\s+NOT IN\s*\([^\)]+\)',	// NOT IN (list)
-- 
cgit v1.2.3-24-g4f1b


From 341532c5d631689c3f9f1a318db598d1ce5344d8 Mon Sep 17 00:00:00 2001
From: Tufan Barış YILDIRIM <tufanbarisyildirim@gmail.com>
Date: Thu, 19 Dec 2013 21:32:42 +0200
Subject: so we need \sNOT EXISTS

---
 system/database/DB_driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 33903434c..ba6a4b70d 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1421,7 +1421,7 @@ abstract class CI_DB_driver {
 	 */
 	protected function _has_operator($str)
 	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sNOT EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 295cfa92574c2ee0c0465e4f86a0d3215a32413c Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 20 Dec 2013 11:48:38 +0200
Subject: Polishing changes from #PR #2781

Looks like an unnecessary commit was made by the author just as I was clicking the Merge button. :)
---
 system/database/DB_driver.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index ba6a4b70d..4791c3b89 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1421,7 +1421,7 @@ abstract class CI_DB_driver {
 	 */
 	protected function _has_operator($str)
 	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sNOT EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
 	}
 
 	// --------------------------------------------------------------------
@@ -1446,9 +1446,9 @@ abstract class CI_DB_driver {
 				'\s*<>?\s*',			// <, <>
 				'\s*>\s*',			// >
 				'\s+IS NULL',			// IS NULL
-				'\s+IS NOT NULL',	// IS NOT NULL
+				'\s+IS NOT NULL',		// IS NOT NULL
 				'\s+EXISTS\s*\([^\)]+\)',	// EXISTS(sql)
-				'\s+NOT EXISTS\s*\([^\)]+\)',		// NOT EXISTS(sql)
+				'\s+NOT EXISTS\s*\([^\)]+\)',	// NOT EXISTS(sql)
 				'\s+BETWEEN\s+\S+\s+AND\s+\S+',	// BETWEEN value AND value
 				'\s+IN\s*\([^\)]+\)',		// IN(list)
 				'\s+NOT IN\s*\([^\)]+\)',	// NOT IN (list)
-- 
cgit v1.2.3-24-g4f1b


From 1720a6aee782b1193454e2ec172f3e89461f83f4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Jan 2014 13:50:05 +0200
Subject: Fix #2579: Query Builder's "no escape" functionality didn't work
 properly with query cache

---
 system/database/DB_query_builder.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 1d41a19ba..c543e1584 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2556,6 +2556,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			return;
 		}
+		elseif (in_array('select', $this->qb_cache_exists, TRUE))
+		{
+			$qb_no_escape = $this->qb_cache_no_escape;
+		}
 
 		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
 		{
@@ -2563,12 +2567,23 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			$qb_cache_var	= 'qb_cache_'.$val;
 			$qb_new 	= $this->$qb_cache_var;
 
-			foreach ($this->$qb_variable as &$qb_var)
+			for ($i = 0, $c = count($this->$qb_variable); $i < $c; $i++)
 			{
-			 	in_array($qb_var, $qb_new, TRUE) OR $qb_new[] = $qb_var;
+				if ( ! in_array($this->{$qb_variable}[$i], $qb_new, TRUE))
+				{
+					$qb_new[] = $this->{$qb_variable}[$i];
+					if ($val === 'select')
+					{
+						$qb_no_escape[] = $this->qb_no_escape[$i];
+					}
+				}
 			}
 
 			$this->$qb_variable = $qb_new;
+			if ($val === 'select')
+			{
+				$this->qb_no_escape = $qb_no_escape;
+			}
 		}
 
 		// If we are "protecting identifiers" we need to examine the "from"
@@ -2577,8 +2592,6 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			$this->_track_aliases($this->qb_from);
 		}
-
-		$this->qb_no_escape = array_merge($this->qb_no_escape, array_diff($this->qb_cache_no_escape, $this->qb_no_escape));
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From d98c4a3557aa87c02f262f0f7495691f1bc174f0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 7 Jan 2014 17:33:32 +0200
Subject: A tiny regexp improvement for CI_DB_driver::is_write_type()

---
 system/database/DB_driver.php                               | 2 +-
 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 2 +-
 system/database/drivers/postgre/postgre_driver.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 4791c3b89..f066b58de 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -924,7 +924,7 @@ abstract class CI_DB_driver {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i', $sql);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index fda3f238b..6ee327bd5 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -137,7 +137,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index b72fb873a..19404ae55 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -318,7 +318,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s+/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
+		return (bool) preg_match('/^\s*"?(SET|INSERT(?![^\)]+\)\s+RETURNING)|UPDATE(?!.*\sRETURNING)|DELETE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i', str_replace(array("\r\n", "\r", "\n"), ' ', $sql));
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 119d8a7547e155edaaa53682b9247cd7e80d8c9d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 8 Jan 2014 15:27:53 +0200
Subject: Optimize get_instance() calls/assignments

---
 system/database/DB_utility.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 9f953d4ac..665615909 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -282,8 +282,7 @@ abstract class CI_DB_utility {
 		extract($params);
 
 		// Load the xml helper
-		$CI =& get_instance();
-		$CI->load->helper('xml');
+		get_instance()->load->helper('xml');
 
 		// Generate the result
 		$xml = '<'.$root.'>'.$newline;
-- 
cgit v1.2.3-24-g4f1b