diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-02-25 15:18:38 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-02-25 15:18:38 +0100 |
| commit | 9a4d1da5fa823b6bb58cdd1d210f782e95830e91 (patch) | |
| tree | ef9737987a75afadaac4d525570ab3675301681c | |
| parent | 80ddb6b70f97c8b08f02b0d8dcffbc6ab136555c (diff) | |
Fixed an AR_caching error where it wasn't tracking table aliases (#3463)
| -rw-r--r-- | system/database/DB_active_rec.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/sqlite/sqlite_driver.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
9 files changed, 9 insertions, 8 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 263172a86..903584200 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -289,7 +289,7 @@ class CI_DB_active_record extends CI_DB_driver { $this->ar_from[] = $this->_protect_identifiers($this->_track_aliases($val));
if ($this->ar_caching === TRUE)
{
- $this->ar_cache_from[] = $this->_protect_identifiers($val);
+ $this->ar_cache_from[] = $this->_protect_identifiers($this->_track_aliases($val));
}
}
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 7b024d414..1ed333de0 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -465,7 +465,7 @@ class CI_DB_mssql_driver extends CI_DB { return "\"{$item}\"";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index edf09a170..2bc66ecf2 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -471,7 +471,7 @@ class CI_DB_mysql_driver extends CI_DB { return "`{$item}`";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 73396c594..6ff37f7e2 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -464,7 +464,7 @@ class CI_DB_mysqli_driver extends CI_DB { return "`{$item}`";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index ec26f5be6..364268b98 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -576,7 +576,7 @@ class CI_DB_oci8_driver extends CI_DB { return "\"{$item}\"";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index bdedab32f..82fe36b5d 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -437,7 +437,7 @@ class CI_DB_odbc_driver extends CI_DB { return "{$item}";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index ce8cb258a..4eff97fcc 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -461,7 +461,7 @@ class CI_DB_postgre_driver extends CI_DB { return "\"{$item}\"";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index c51edfb07..c859dea6e 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -455,7 +455,7 @@ class CI_DB_sqlite_driver extends CI_DB { return "{$item}";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 072843e4c..bb155ea8a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@ Change Log <h3>Bugfixes for 1.6.2</h3>
<ul>
<li>Fixed assorted user guide typos (#3453)</li>
+ <li>Fixed an AR_caching error where it wasn't tracking table aliases (#3463)</li>
<li>Fixed a bug in the DB class testing the $params argument</li>
</ul>
<h2>Version 1.6.1</h2>
|