From d3d8662ae36c2d075c1ef4ee77b73b175006da99 Mon Sep 17 00:00:00 2001 From: itsmerhp <49250107+itsmerhp@users.noreply.github.com> Date: Fri, 26 Apr 2019 10:20:27 +0530 Subject: [PATCH] Fix#810 (#908) * Test cases : AUthentication - Auth, Forgot Password, Collections - Create, Delete * #810 done * #810 Reverting Test Cases --- src/core/Directus/Database/Query/Builder.php | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/Directus/Database/Query/Builder.php b/src/core/Directus/Database/Query/Builder.php index 04caf1c153..d1a331da5d 100644 --- a/src/core/Directus/Database/Query/Builder.php +++ b/src/core/Directus/Database/Query/Builder.php @@ -267,9 +267,9 @@ public function orWhereIn($column, $values, $not = false) * * @return Builder */ - public function whereNotIn($column, array $values) + public function whereNotIn($column, array $values, $not = false, $logical = 'and') { - return $this->whereIn($column, $values, true); + return $this->whereIn($column, $values, true, $logical); } public function whereBetween($column, array $values, $not = false, $logical = 'and') @@ -277,9 +277,9 @@ public function whereBetween($column, array $values, $not = false, $logical = 'a return $this->where($column, 'between', $values, $not, $logical); } - public function whereNotBetween($column, array $values) + public function whereNotBetween($column, array $values, $not = false, $logical = 'and') { - return $this->whereBetween($column, $values, true); + return $this->whereBetween($column, $values, true, $logical); } public function whereEqualTo($column, $value, $not = false, $logical = 'and') @@ -292,29 +292,29 @@ public function orWhereEqualTo($column, $value, $not = false) return $this->where($column, '=', $value, $not, 'or'); } - public function whereNotEqualTo($column, $value) + public function whereNotEqualTo($column, $value, $not = false, $logical = 'and') { - return $this->whereEqualTo($column, $value, true); + return $this->whereEqualTo($column, $value, true, $logical); } - public function whereLessThan($column, $value) + public function whereLessThan($column, $value, $not = false, $logical = 'and') { - return $this->where($column, '<', $value); + return $this->where($column, '<', $value, $not, $logical); } - public function whereLessThanOrEqual($column, $value) + public function whereLessThanOrEqual($column, $value, $not = false, $logical = 'and') { - return $this->where($column, '<=', $value); + return $this->where($column, '<=', $value, $not, $logical); } - public function whereGreaterThan($column, $value) + public function whereGreaterThan($column, $value, $not = false, $logical = 'and') { - return $this->where($column, '>', $value); + return $this->where($column, '>', $value, $not, $logical); } - public function whereGreaterThanOrEqual($column, $value) + public function whereGreaterThanOrEqual($column, $value, $not = false, $logical = 'and') { - return $this->where($column, '>=', $value); + return $this->where($column, '>=', $value, $not, $logical); } public function whereNull($column, $not = false, $logical = 'and') @@ -342,9 +342,9 @@ public function orWhereLike($column, $value, $not = false) return $this->whereLike($column, $value, $not, 'or'); } - public function whereNotLike($column, $value) + public function whereNotLike($column, $value, $not = false, $logical = 'and') { - return $this->whereLike($column, $value, true); + return $this->whereLike($column, $value, true, $logical); } public function whereAll($column, $table, $columnLeft, $columnRight, $values)