Commit 22676cce by Taylor Otwell

Refactor the query->get() method.

parent 3d30f9f8
...@@ -524,6 +524,22 @@ class Query { ...@@ -524,6 +524,22 @@ class Query {
$this->select($columns); $this->select($columns);
} }
$results = $this->connection->query($this->compile_select(), $this->bindings);
// Reset the SELECT clause so more queries can be performed using the same instance.
// This is helpful for getting aggregates and then getting actual results.
$this->select = null;
return $results;
}
/**
* Compile the query into a SQL SELECT statement.
*
* @return string
*/
private function compile_select()
{
$sql = $this->select.' '.$this->from.' '.$this->where; $sql = $this->select.' '.$this->from.' '.$this->where;
if (count($this->orderings) > 0) if (count($this->orderings) > 0)
...@@ -541,13 +557,7 @@ class Query { ...@@ -541,13 +557,7 @@ class Query {
$sql .= ' OFFSET '.$this->offset; $sql .= ' OFFSET '.$this->offset;
} }
$results = $this->connection->query($sql, $this->bindings); return $sql;
// Reset the SELECT clause so more queries can be performed using the same instance.
// This is helpful for getting aggregates and then getting actual results.
$this->select = null;
return $results;
} }
/** /**
...@@ -586,7 +596,7 @@ class Query { ...@@ -586,7 +596,7 @@ class Query {
} }
/** /**
* Compile an SQL INSERT statement. * Compile the query into a SQL INSERT statement.
* *
* @param array $values * @param array $values
* @return string * @return string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment