diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-09-29 10:43:48 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-09-29 10:43:48 +0200 |
| commit | 970b3836071f1b74d2c98bdc0656c2d9699c9ac0 (patch) | |
| tree | 06135ab9944319fc0b3e9872632b8554bfeba68e | |
| parent | f9a615a5a304a2ead573d6e2869ee4ec7620511e (diff) | |
Revert #3194
This has caused way too many BC breaks (#3238, #3242, #3257).
Close #3257
| -rw-r--r-- | system/database/DB_query_builder.php | 13 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 4b3aa4d6c..30882fadc 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -661,19 +661,6 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // value appears not to have been set, assign the test to IS NULL $k .= ' IS NULL'; } - else - { - $operator = $this->_get_operator($k); - if (stripos($operator, 'NULL') === FALSE && strncasecmp(ltrim($operator), 'IN', 2) !== 0) - { - $op = strrpos($k, $operator); - if (strlen($k) === ($op + strlen($operator))) - { - $operator = strtr($operator, array('<>' => 'IS NOT', '!=' => 'IS NOT')); - $k = substr($k, 0, $op).rtrim($operator).' NULL'; - } - } - } $this->{$qb_key}[] = array('condition' => $prefix.$k.$v, 'escape' => $escape); if ($this->qb_caching === TRUE) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index db73e22ed..2b807eb49 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -187,7 +187,6 @@ Release Date: Not Released - Changed ``limit()`` to ignore NULL values instead of always casting to integer. - Changed ``offset()`` to ignore empty values instead of always casting to integer. - Methods ``insert_batch()`` and ``update_batch()`` now return an integer representing the number of rows affected by them. - - Methods ``where()``, ``or_where()``, ``having()`` and ``or_having()`` now convert the operators *<>* and *!=* into *IS NOT NULL* when the supplied for comparison value is equal to *NULL*. - :doc:`Database Results <database/results>` changes include: |