Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the query->get() method.

This commit is contained in:
Taylor Otwell 2011-08-08 16:09:08 -05:00
parent 3d30f9f855
commit 22676ccee0
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
system/db/query.php
View File

@ -524,6 +524,22 @@ public function get($columns = array('*'))
$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;
if (count($this->orderings) > 0)
@ -541,13 +557,7 @@ public function get($columns = array('*'))
$sql .= ' OFFSET '.$this->offset;
}
$results = $this->connection->query($sql, $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;
return $sql;
}
/**
@ -586,7 +596,7 @@ public function insert_get_id($values)
}
/**
* Compile an SQL INSERT statement.
* Compile the query into a SQL INSERT statement.
*
* @param array $values
* @return string