php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #828: refactored QueryBuilder::build()

Browse Source
This commit is contained in:
Qiang Xue
2013-08-29 16:47:48 -04:00
parent 147558ea19
commit 6dba4da3ed
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/db/ActiveQuery.php
View File

@@ -156,6 +156,8 @@ class ActiveQuery extends Query
if ($db === null) { if ($db === null) {
$db = $modelClass::getDb(); $db = $modelClass::getDb();
} }
$params = $this->params;
if ($this->sql === null) { if ($this->sql === null) {
if ($this->from === null) { if ($this->from === null) {
$tableName = $modelClass::tableName(); $tableName = $modelClass::tableName();
@@ -164,11 +166,9 @@ class ActiveQuery extends Query
} }
$this->from = array($tableName); $this->from = array($tableName);
} }
/** @var $qb QueryBuilder */ list ($this->sql, $params) = $db->getQueryBuilder()->build($this);
$qb = $db->getQueryBuilder();
$this->sql = $qb->build($this);
} }
return $db->createCommand($this->sql, $this->params); return $db->createCommand($this->sql, $params);
} }
/** /**

4
framework/yii/db/ActiveRelation.php
View File

@@ -297,7 +297,7 @@ class ActiveRelation extends ActiveQuery
/** @var $primaryModel ActiveRecord */ /** @var $primaryModel ActiveRecord */
$primaryModel = reset($primaryModels); $primaryModel = reset($primaryModels);
$db = $primaryModel->getDb(); $db = $primaryModel->getDb();
$sql = $db->getQueryBuilder()->build($this); list ($sql, $params) = $db->getQueryBuilder()->build($this);
return $db->createCommand($sql, $this->params)->queryAll(); return $db->createCommand($sql, $params)->queryAll();
} }
} }

4
framework/yii/db/Query.php
View File

@@ -149,8 +149,8 @@ class Query extends Component
if ($db === null) { if ($db === null) {
$db = Yii::$app->getDb(); $db = Yii::$app->getDb();
} }
$sql = $db->getQueryBuilder()->build($this); list ($sql, $params) = $db->getQueryBuilder()->build($this);
return $db->createCommand($sql, $this->params); return $db->createCommand($sql, $params);
} }
/** /**

20
framework/yii/db/QueryBuilder.php
View File

@@ -55,22 +55,24 @@ class QueryBuilder extends \yii\base\Object
/** /**
* Generates a SELECT SQL statement from a [[Query]] object. * Generates a SELECT SQL statement from a [[Query]] object.
* @param Query $query the [[Query]] object from which the SQL statement will be generated * @param Query $query the [[Query]] object from which the SQL statement will be generated
* @return string the generated SQL statement * @return array the generated SQL statement (the first array element) and the corresponding
* parameters to be bound to the SQL statement (the second array element).
*/ */
public function build($query) public function build($query)
{ {
$params = $query->params;
$clauses = array( $clauses = array(
$this->buildSelect($query->select, $query->distinct, $query->selectOption), $this->buildSelect($query->select, $query->distinct, $query->selectOption),
$this->buildFrom($query->from), $this->buildFrom($query->from),
$this->buildJoin($query->join, $query->params), $this->buildJoin($query->join, $params),
$this->buildWhere($query->where, $query->params), $this->buildWhere($query->where, $params),
$this->buildGroupBy($query->groupBy), $this->buildGroupBy($query->groupBy),
$this->buildHaving($query->having, $query->params), $this->buildHaving($query->having, $params),
$this->buildUnion($query->union, $query->params), $this->buildUnion($query->union, $params),
$this->buildOrderBy($query->orderBy), $this->buildOrderBy($query->orderBy),
$this->buildLimit($query->limit, $query->offset), $this->buildLimit($query->limit, $query->offset),
); );
return implode($this->separator, array_filter($clauses)); return array(implode($this->separator, array_filter($clauses)), $params);
} }
/** /**
@@ -718,9 +720,11 @@ class QueryBuilder extends \yii\base\Object
} }
foreach ($unions as $i => $union) { foreach ($unions as $i => $union) {
if ($union instanceof Query) { if ($union instanceof Query) {
// save the original parameters so that we can restore them later to prevent from modifying the query object
$originalParams = $union->params;
$union->addParams($params); $union->addParams($params);
$unions[$i] = $this->build($union); list ($unions[$i], $params) = $this->build($union);
$params = $union->params; $union->params = $originalParams;
} }
} }
return "UNION (\n" . implode("\n) UNION (\n", $unions) . "\n)"; return "UNION (\n" . implode("\n) UNION (\n", $unions) . "\n)";

2
tests/unit/framework/db/QueryBuilderTest.php
View File

@@ -112,7 +112,7 @@ class QueryBuilderTest extends DatabaseTestCase
} }
} }
public function testAddDropPrimayKey() public function testAddDropPrimaryKey()
{ {
$tableName = 'tbl_constraints'; $tableName = 'tbl_constraints';
$pkeyName = $tableName . "_pkey"; $pkeyName = $tableName . "_pkey";