Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Fix#810 #908

Merged
merged 4 commits into from Apr 26, 2019
Merged

Fix#810 #908

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2189a0
Test cases : AUthentication - Auth, Forgot Password, Collections - Cr…
Apr 6, 2019
0c954b1
#810 done
Apr 25, 2019
6496c43
Merge branch 'fix_810' of https://github.com/itsmerhp/api into fix_810
Apr 25, 2019
cbfb97b
#810 Reverting Test Cases
Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/core/Directus/Database/Query/Builder.php
View file
Open in desktop
Expand Up @@ -267,19 +267,19 @@ 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')
{
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')
Expand All @@ -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')
Expand Down Expand Up @@ -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)
Expand Down