diff options
author | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
commit | 477e08f1d6726809660e4841f389493541f7bc07 (patch) | |
tree | 785b12b53c5e46e317def1768558f33445ab2b1f /system/database/DB_driver.php | |
parent | 2342256c076502cbaca86fcff2a1dbbfc49a1900 (diff) | |
parent | 39967987ebcc79fc867c1f7fa8d69cc65801f594 (diff) |
Merge branch '3.0-stable' into develop
Fixed conflicts:
user_guide_src/source/overview/at_a_glance.rst
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r-- | system/database/DB_driver.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 1b52bf3b8..43e8eeac6 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1504,11 +1504,11 @@ abstract class CI_DB_driver { '\s*>\s*', // > '\s+IS NULL', // IS NULL '\s+IS NOT NULL', // IS NOT NULL - '\s+EXISTS\s*\([^\)]+\)', // EXISTS(sql) - '\s+NOT EXISTS\s*\([^\)]+\)', // NOT EXISTS(sql) + '\s+EXISTS\s*\(.*\)', // EXISTS(sql) + '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql) '\s+BETWEEN\s+', // BETWEEN value AND value - '\s+IN\s*\([^\)]+\)', // IN(list) - '\s+NOT IN\s*\([^\)]+\)', // NOT IN (list) + '\s+IN\s*\(.*\)', // IN(list) + '\s+NOT IN\s*\(.*\)', // NOT IN (list) '\s+LIKE\s+\S.*('.$_les.')?', // LIKE 'expr'[ ESCAPE '%s'] '\s+NOT LIKE\s+\S.*('.$_les.')?' // NOT LIKE 'expr'[ ESCAPE '%s'] ); |