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

Commit

Permalink
Fix#810 (#908)
Browse files Browse the repository at this point in the history
* Test cases : AUthentication - Auth, Forgot Password, Collections - Create, Delete

* #810 done

* #810 Reverting Test Cases
  • Loading branch information
itsmerhp authored and binal-7span committed Apr 26, 2019
1 parent 1beb673 commit d3d8662
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/core/Directus/Database/Query/Builder.php
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

0 comments on commit d3d8662

Please sign in to comment.