more additions.

This commit is contained in:
Taylor Otwell
2011-08-19 21:39:38 -05:00
parent 9d2a76b26f
commit fb1acc31d2
3 changed files with 39 additions and 13 deletions

View File

@@ -35,7 +35,7 @@ class Connection {
*
* @var Connector
*/
protected $connector;
private $connector;
/**
* Create a new Connection instance.
@@ -57,7 +57,7 @@ class Connection {
*
* @return void
*/
protected function connect()
public function connect()
{
$this->pdo = $this->connector->connect($this->config);
}
@@ -67,7 +67,7 @@ class Connection {
*
* @return bool
*/
protected function connected()
public function connected()
{
return ! is_null($this->pdo);
}
@@ -128,7 +128,7 @@ class Connection {
* @param array $results
* @return mixed
*/
protected function execute(\PDOStatement $statement, $bindings)
private function execute(\PDOStatement $statement, $bindings)
{
$result = $statement->execute($bindings);

View File

@@ -471,7 +471,13 @@ class Query {
{
$this->select = 'SELECT '.$aggregator.'('.$this->wrap($column).') AS '.$this->wrap('aggregate');
return $this->first()->aggregate;
$result = $this->connection->scalar($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 $result;
}
/**
@@ -656,10 +662,7 @@ class Query {
*
* @return string
*/
protected function wrapper()
{
return '"';
}
protected function wrapper() { return '"'; }
/**
* Create query parameters from an array of values.