Skip to content
Open
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions src/QueryBuilder/QueryBuilderHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ public function setFetchMode($mode)
*/
public function asObject($className, $constructorArgs = array())
{
var_dump('need to implement this'); die();
var_dump('need to implement this');
die();

return $this->setFetchMode(\PDO::FETCH_CLASS, $className, $constructorArgs);
}
Expand Down Expand Up @@ -282,7 +283,7 @@ public function getQuery($type = 'select', $dataToBePassed = array())
}

$queryArr = $this->adapterInstance->$type($this->statements, $dataToBePassed);

return $this->container->build(
'\\WpFluent\\QueryBuilder\\QueryObject',
array($queryArr['sql'], $queryArr['bindings'])
Expand Down Expand Up @@ -689,7 +690,9 @@ public function orWhereNot($key, $operator = null, $value = null)
*/
public function whereIn($key, $values)
{
return $this->whereHandler($key, 'IN', $values, 'AND');
return $this->when($values, function ($query, $values) use ($key) {
return $query->whereHandler($key, 'IN', $values, 'AND');
});
}

/**
Expand All @@ -700,7 +703,9 @@ public function whereIn($key, $values)
*/
public function whereNotIn($key, $values)
{
return $this->whereHandler($key, 'NOT IN', $values, 'AND');
return $this->when($values, function ($query, $values) use ($key) {
return $query->whereHandler($key, 'NOT IN', $values, 'AND');
});
}

/**
Expand All @@ -711,7 +716,9 @@ public function whereNotIn($key, $values)
*/
public function orWhereIn($key, $values)
{
return $this->whereHandler($key, 'IN', $values, 'OR');
return $this->when($values, function ($query, $values) use ($key) {
return $query->whereHandler($key, 'IN', $values, 'OR');
});
}

/**
Expand All @@ -722,7 +729,9 @@ public function orWhereIn($key, $values)
*/
public function orWhereNotIn($key, $values)
{
return $this->whereHandler($key, 'NOT IN', $values, 'OR');
return $this->when($values, function ($query, $values) use ($key) {
return $query->whereHandler($key, 'NOT IN', $values, 'OR');
});
}

/**
Expand Down