Skip to content

Commit 295cfa9

Browse files
committed
Polishing changes from #PR bcit-ci#2781
Looks like an unnecessary commit was made by the author just as I was clicking the Merge button. :)
1 parent ec03e97 commit 295cfa9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

system/database/DB_driver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ protected function _update($table, $values)
14211421
*/
14221422
protected function _has_operator($str)
14231423
{
1424-
return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sNOT EXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
1424+
return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
14251425
}
14261426

14271427
// --------------------------------------------------------------------
@@ -1446,9 +1446,9 @@ protected function _get_operator($str)
14461446
'\s*<>?\s*', // <, <>
14471447
'\s*>\s*', // >
14481448
'\s+IS NULL', // IS NULL
1449-
'\s+IS NOT NULL', // IS NOT NULL
1449+
'\s+IS NOT NULL', // IS NOT NULL
14501450
'\s+EXISTS\s*\([^\)]+\)', // EXISTS(sql)
1451-
'\s+NOT EXISTS\s*\([^\)]+\)', // NOT EXISTS(sql)
1451+
'\s+NOT EXISTS\s*\([^\)]+\)', // NOT EXISTS(sql)
14521452
'\s+BETWEEN\s+\S+\s+AND\s+\S+', // BETWEEN value AND value
14531453
'\s+IN\s*\([^\)]+\)', // IN(list)
14541454
'\s+NOT IN\s*\([^\)]+\)', // NOT IN (list)

user_guide_src/source/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ Release Date: Not Released
137137

138138
- Database
139139

140-
- Added EXISTS / NOT EXISTS support to DB_Driver class.
141140
- Added **dsn** configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
142141
- Added **schema** configuration setting (defaults to *public*) for drivers that might need it (currently used by PostgreSQL and ODBC).
143142
- Added subdrivers support (currently only used by PDO).
@@ -166,6 +165,7 @@ Release Date: Not Released
166165
- Added an optional parameter that allows to disable escaping (useful for custom fields) for methods ``join()``, ``order_by()``, ``where_in()``, ``or_where_in()``, ``where_not_in()``, ``or_where_not_in()``, ``insert()``, ``insert_batch()``.
167166
- Added support for ``join()`` with multiple conditions.
168167
- Added support for *USING* in ``join()``.
168+
- Added support for *EXISTS* in ``where()``.
169169
- Added seed values support for random ordering with ``order_by(seed, 'RANDOM')``.
170170
- Changed ``limit()`` to ignore NULL values instead of always casting to integer.
171171
- Changed ``offset()`` to ignore empty values instead of always casting to integer.

0 commit comments

Comments
 (0)