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

Refactoring System\DB\Query.

This commit is contained in:
Taylor Otwell 2011-06-17 13:09:50 -07:00
parent 2f7fa6687c
commit 5bfbfe4243
1 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
system/db/query.php
View File

@ -1,5 +1,9 @@
<?php namespace System\DB; <?php namespace System\DB;
use System\DB;
use System\Config;
use System\Str;
class Query { class Query {
/** /**
@ -81,7 +85,7 @@ class Query {
*/ */
public function __construct($table, $connection = null) public function __construct($table, $connection = null)
{ {
$this->connection = (is_null($connection)) ? \System\Config::get('db.default') : $connection; $this->connection = (is_null($connection)) ? Config::get('db.default') : $connection;
$this->from = 'FROM '.$this->wrap($this->table = $table); $this->from = 'FROM '.$this->wrap($this->table = $table);
} }
@ -116,10 +120,6 @@ public function distinct()
public function select() public function select()
{ {
$this->select = ($this->distinct) ? 'SELECT DISTINCT ' : 'SELECT '; $this->select = ($this->distinct) ? 'SELECT DISTINCT ' : 'SELECT ';
// ---------------------------------------------------
// Wrap all of the columns in keyword identifiers.
// ---------------------------------------------------
$this->select .= implode(', ', array_map(array($this, 'wrap'), func_get_args())); $this->select .= implode(', ', array_map(array($this, 'wrap'), func_get_args()));
return $this; return $this;
@ -326,7 +326,7 @@ public function or_where_not_null($column)
*/ */
public function order_by($column, $direction) public function order_by($column, $direction)
{ {
$this->orderings[] = $this->wrap($column).' '.\System\Str::upper($direction); $this->orderings[] = $this->wrap($column).' '.Str::upper($direction);
return $this; return $this;
} }
@ -387,7 +387,7 @@ public function get()
call_user_func_array(array($this, 'select'), (count(func_get_args()) > 0) ? func_get_args() : array('*')); call_user_func_array(array($this, 'select'), (count(func_get_args()) > 0) ? func_get_args() : array('*'));
} }
return \System\DB::query(Query\Compiler::select($this), $this->bindings, $this->connection); return DB::query(Query\Compiler::select($this), $this->bindings, $this->connection);
} }
/** /**
@ -400,10 +400,7 @@ public function get()
private function aggregate($aggregator, $column) private function aggregate($aggregator, $column)
{ {
$this->select = 'SELECT '.$aggregator.'('.$this->wrap($column).') AS '.$this->wrap('aggregate'); $this->select = 'SELECT '.$aggregator.'('.$this->wrap($column).') AS '.$this->wrap('aggregate');
return $this->first()->aggregate;
$results = \System\DB::query(Query\Compiler::select($this), $this->bindings);
return $results[0]->aggregate;
} }
/** /**
@ -414,7 +411,7 @@ private function aggregate($aggregator, $column)
*/ */
public function insert($values) public function insert($values)
{ {
return \System\DB::query(Query\Compiler::insert($this, $values), array_values($values), $this->connection); return DB::query(Query\Compiler::insert($this, $values), array_values($values), $this->connection);
} }
/** /**
@ -427,28 +424,25 @@ public function insert_get_id($values)
{ {
$sql = Query\Compiler::insert($this, $values); $sql = Query\Compiler::insert($this, $values);
// --------------------------------------------------- // ---------------------------------------------------------
// Postgres. // Use the RETURNING clause on Postgres instead of PDO.
// --------------------------------------------------- // The Postgres PDO ID method is slightly cumbersome.
if (\System\DB::connection($this->connection)->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'pgsql') // ---------------------------------------------------------
if (DB::driver($this->connection) == 'pgsql')
{ {
$sql .= ' RETURNING '.$this->wrap('id'); $query = DB::connection($this->connection)->prepare($sql.' RETURNING '.$this->wrap('id'));
$query = \System\DB::connection($this->connection)->prepare($sql);
$query->execute(array_values($values)); $query->execute(array_values($values));
$result = $query->fetch(\PDO::FETCH_ASSOC); return $query->fetch(\PDO::FETCH_CLASS, 'stdClass')->id;
}
return $result['id']; // ---------------------------------------------------------
} // Use the PDO ID method for MySQL and SQLite.
// --------------------------------------------------- // ---------------------------------------------------------
// MySQL and SQLite. DB::query($sql, array_values($values), $this->connection);
// ---------------------------------------------------
else return DB::connection($this->connection)->lastInsertId();
{
\System\DB::query($sql, array_values($values), $this->connection);
return \System\DB::connection($this->connection)->lastInsertId();
}
} }
/** /**
@ -459,7 +453,7 @@ public function insert_get_id($values)
*/ */
public function update($values) public function update($values)
{ {
return \System\DB::query(Query\Compiler::update($this, $values), array_merge(array_values($values), $this->bindings), $this->connection); return DB::query(Query\Compiler::update($this, $values), array_merge(array_values($values), $this->bindings), $this->connection);
} }
/** /**
@ -475,27 +469,18 @@ public function delete($id = null)
$this->where('id', '=', $id); $this->where('id', '=', $id);
} }
return \System\DB::query(Query\Compiler::delete($this), $this->bindings, $this->connection); return DB::query(Query\Compiler::delete($this), $this->bindings, $this->connection);
} }
/** /**
* Wrap a value in keyword identifiers. * Wrap a value in keyword identifiers.
* *
* @param string $value * @param string $value
* @param string $wrap
* @return string * @return string
*/ */
public function wrap($value, $wrap = '"') public function wrap($value)
{ {
// --------------------------------------------------- $wrap = (DB::driver($this->connection) == 'mysql') ? '`' : '"';
// If the application is using MySQL, we need to use
// a non-standard keyword identifier.
// ---------------------------------------------------
if (\System\DB::connection($this->connection)->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'mysql')
{
$wrap = '`';
}
return implode('.', array_map(function($segment) use ($wrap) {return ($segment != '*') ? $wrap.$segment.$wrap : $segment;}, explode('.', $value))); return implode('.', array_map(function($segment) use ($wrap) {return ($segment != '*') ? $wrap.$segment.$wrap : $segment;}, explode('.', $value)));
} }
@ -515,17 +500,12 @@ public function parameterize($values)
*/ */
public function __call($method, $parameters) public function __call($method, $parameters)
{ {
// ---------------------------------------------------
// Handle any of the aggregate functions.
// ---------------------------------------------------
if (in_array($method, array('count', 'min', 'max', 'avg', 'sum'))) if (in_array($method, array('count', 'min', 'max', 'avg', 'sum')))
{ {
return ($method == 'count') ? $this->aggregate(\System\Str::upper($method), '*') : $this->aggregate(\System\Str::upper($method), $parameters[0]); return ($method == 'count') ? $this->aggregate(Str::upper($method), '*') : $this->aggregate(Str::upper($method), $parameters[0]);
} }
else
{
throw new \Exception("Method [$method] is not defined on the Query class."); throw new \Exception("Method [$method] is not defined on the Query class.");
} }
}
} }