summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-09-03 10:23:44 +0200
committerAndrey Andreev <narf@devilix.net>2015-09-03 10:23:44 +0200
commit0d0c53c50ccf34a216b19e90d2dc6adc51436f44 (patch)
tree7413c59b3578d1824d2733e16586a27f50dd61d8
parentc283443ad0c839a02485e071171ced644f017a1f (diff)
Fix #4096
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 0c2e49974..fe0cd7d32 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1487,7 +1487,7 @@ abstract class CI_DB_driver {
'\s+IS NOT NULL', // IS NOT NULL
'\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+BETWEEN\s+', // BETWEEN value AND value
'\s+IN\s*\([^\)]+\)', // IN(list)
'\s+NOT IN\s*\([^\)]+\)', // NOT IN (list)
'\s+LIKE\s+\S.*('.$_les.')?', // LIKE 'expr'[ ESCAPE '%s']
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 69a7ed485..5fa9c7805 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -25,6 +25,7 @@ Bug fixes for 3.0.2
- Fixed a bug (#4086) - :doc:`Query Builder <database/query_builder>` didn't apply *dbprefix* to LIKE conditions if the pattern included spaces.
- Fixed a bug (#4091) - :doc:`Cache Library <libraries/caching>` 'file' driver could be tricked into accepting empty cache item IDs.
- Fixed a bug (#4093) - :doc:`Query Builder <database/query_builder>` modified string values containing 'AND', 'OR' while compiling WHERE conditions.
+- Fixed a bug (#4096) - :doc:`Query Builder <database/query_builder>` didn't apply *dbprefix* when compiling BETWEEN conditions.
Version 3.0.1
=============