Skip to content

Ref #649 - Added query builder support for BETWEEN clauses #1365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2012
Merged

Ref #649 - Added query builder support for BETWEEN clauses #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions laravel/database/query.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,67 @@ public function or_where_not_in($column, $values)
{
return $this->where_not_in($column, $values, 'OR');
}

/**
* Add a BETWEEN condition to the query
*
* @param string $column
* @param mixed $min
* @param mixed $max
* @param string $connector
* @param boolean $not
* @return Query
*/
public function where_between($column, $min, $max, $connector = 'AND', $not = false)
{
$type = ($not) ? 'where_not_between' : 'where_between';

$this->wheres[] = compact('type', 'column', 'min', 'max', 'connector');

$this->bindings[] = $min;
$this->bindings[] = $max;

return $this;
}

/**
* Add a OR BETWEEN condition to the query
*
* @param string $column
* @param mixed $min
* @param mixed $max
* @return Query
*/
public function or_where_between($column, $min, $max)
{
return $this->where_between($column, $min, $max, 'OR');
}

/**
* Add a NOT BETWEEN condition to the query
*
* @param string $column
* @param mixed $min
* @param mixed $max
* @return Query
*/
public function where_not_between($column, $min, $max, $connector = 'AND')
{
return $this->where_between($column, $min, $max, $connector, true);
}

/**
* Add a OR NOT BETWEEN condition to the query
*
* @param string $column
* @param mixed $min
* @param mixed $max
* @return Query
*/
public function or_where_not_between($column, $min, $max)
{
return $this->where_not_between($column, $min, $max, 'OR');
}

/**
* Add a where null condition to the query.
Expand Down
27 changes: 27 additions & 0 deletions laravel/database/query/grammars/grammar.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,33 @@ protected function where_not_in($where)
return $this->wrap($where['column']).' NOT IN ('.$parameters.')';
}

/**
* Compile a WHERE BETWEEN clause
*
* @param array $where
* @return string
*/
protected function where_between($where)
{
$min = $this->parameter($where['min']);
$max = $this->parameter($where['max']);

return $this->wrap($where['column']).' BETWEEN '.$min.' AND '.$max;
}

/**
* Compile a WHERE NOT BETWEEN clause
* @param array $where
* @return string
*/
protected function where_not_between($where)
{
$min = $this->parameter($where['min']);
$max = $this->parameter($where['max']);

return $this->wrap($where['column']).' NOT BETWEEN '.$min.' AND '.$max;
}

/**
* Compile a WHERE NULL clause.
*
Expand Down