Added and documented Active Record caching.

Made AR fully database-prefix aware

7 files changed, 50 insertions, 1 deletions

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index ad747d4ad..ecd404b52 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -433,6 +433,13 @@ class CI_DB_mssql_driver extends CI_DB {
 	function _protect_identifiers($item, $affect_spaces = TRUE, $first_word_only = FALSE)

 	{

 		// MSSQL doesn't use backticks

+		if (strpos($item, '.') !== FALSE)

+		{

+			$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+			$table_name =  substr($item, 0, strpos($item, '.')+1);

+			$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+		}

+

 		return $item;

 	}

 			

diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index f00257250..a5082d1b3 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -454,6 +454,13 @@ class CI_DB_mysql_driver extends CI_DB {
 		// we may need "`item1` `item2`" and not "`item1 item2`"

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return "`field` >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';

 

diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index b2e97f927..9e7cc0c9f 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -448,6 +448,13 @@ class CI_DB_mysqli_driver extends CI_DB {
 		// we may need "`item1` `item2`" and not "`item1 item2`"

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return "`field` >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';

 

diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index ddc0fba99..aa2aeca42 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -559,6 +559,13 @@ class CI_DB_oci8_driver extends CI_DB {
 		// we may need "`item1` `item2`" and not "`item1 item2`"

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return "`field` >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';

 

diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 03c0e6a86..88fff4365 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -424,6 +424,13 @@ class CI_DB_odbc_driver extends CI_DB {
 		// we may need "`item1` `item2`" and not "`item1 item2`"

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return "`field` >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';

 

diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index e72981348..ae8bd86eb 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -444,6 +444,13 @@ class CI_DB_postgre_driver extends CI_DB {
 		// we may need ""item1" "item2"" and not ""item1 item2""

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return ""field" >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';

 

@@ -486,7 +493,7 @@ class CI_DB_postgre_driver extends CI_DB {
 			$tables = array($tables);

 		}

 		

-		return implode(', ', $tables);

+		return '('.implode(', ', $tables).')';

 	}

 

 	// --------------------------------------------------------------------

diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 38febca29..dad5eeedf 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -440,6 +440,13 @@ class CI_DB_sqlite_driver extends CI_DB {
 		// we may need "`item1` `item2`" and not "`item1 item2`"

 		if (ctype_alnum($item) === FALSE)

 		{

+			if (strpos($item, '.') !== FALSE)

+			{

+				$aliased_tables = implode(".",$this->ar_aliased_tables).'.';

+				$table_name =  substr($item, 0, strpos($item, '.')+1);

+				$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;

+			}

+

 			// This function may get "field >= 1", and need it to return "`field` >= 1"

 			$lbound = ($first_word_only === TRUE) ? '' : '|\s|\(';