From 68b0e088a25dee720642f42d76ea395c209be855 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 13 Apr 2018 13:08:52 +0300 Subject: Fix #5448 --- system/database/DB_query_builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database/DB_query_builder.php') diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 8f477e3a1..8bc6328b4 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -987,7 +987,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $v .= sprintf($this->_like_escape_str, $this->_like_escape_chr); } - $qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE", 'value' => $v, 'escape' => $escape); + $qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE {$v}", 'value' => NULL, 'escape' => $escape); $this->qb_where[] = $qb_where; if ($this->qb_caching === TRUE) { -- cgit v1.2.3-24-g4f1b From 9341189a529e28007c7ff566aa5db91488ea7439 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 14 Apr 2018 16:45:56 +0300 Subject: Merge pull request #5464 from ytetsuro/fix/#5462/like-before-bug Fixed issue #5462 Query Builder LIKE BEFORE doesnt work --- system/database/DB_query_builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database/DB_query_builder.php') diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 8bc6328b4..5c0528a3f 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -970,7 +970,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $v = "'{$v}'"; break; case 'before': - $v = "%'{$v}'"; + $v = "'%{$v}'"; break; case 'after': $v = "'{$v}%'"; -- cgit v1.2.3-24-g4f1b From b070d923fee349b36c16010da3ff3c0222dddec3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 23 Apr 2018 14:26:49 +0300 Subject: [ci skip] Merge pull request #5471 from toonitw/patch-1 The value of limit can be zero --- system/database/DB_query_builder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/database/DB_query_builder.php') diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 5c0528a3f..3d0c329b0 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2215,7 +2215,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { protected function _delete($table) { return 'DELETE FROM '.$table.$this->_compile_wh('qb_where') - .($this->qb_limit ? ' LIMIT '.$this->qb_limit : ''); + .($this->qb_limit !== FALSE ? ' LIMIT '.$this->qb_limit : ''); } // -------------------------------------------------------------------- @@ -2365,7 +2365,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { .$this->_compile_order_by(); // ORDER BY // LIMIT - if ($this->qb_limit OR $this->qb_offset) + if ($this->qb_limit !== FALSE OR $this->qb_offset) { return $this->_limit($sql."\n"); } -- cgit v1.2.3-24-g4f1b