w

framework/db/dao/Connection.php

@@ -460,6 +460,11 @@ class Connection extends \yii\base\ApplicationComponent
 		}
 	}
 
+	public function getQueryBuilder()
+	{
+		return $this->getSchema()->getQueryBuilder();
+	}
+
 	/**
 	 * Returns the ID of the last inserted row or sequence value.
 	 * @param string $sequenceName name of the sequence object (required by some DBMS)

framework/db/dao/DataReader.php

@@ -8,6 +8,8 @@
  * @license http://www.yiiframework.com/license/
  */
 
+namespace yii\db\dao;
+
 /**
  * DataReader represents a forward-only stream of rows from a query result set.
  *

framework/db/dao/Query.php

@@ -16,7 +16,7 @@ namespace yii\db\dao;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Query extends CComponent
+class Query extends \yii\base\Component
 {
 	/**
 	 * @var mixed the columns being selected. This refers to the SELECT clause in an SQL
@@ -72,7 +72,7 @@ class Query extends CComponent
 	 * @var array list of query parameter values indexed by parameter placeholders.
 	 * For example, <code>array(':name'=>'Dan', ':age'=>31)</code>.
 	 */
-	public $params;
+	public $params = array();
 
 	public $union;
 
@@ -82,6 +82,18 @@ class Query extends CComponent
 		return $connection->getQueryBuilder()->build($this);
 	}
 
+	public function addParams($params)
+	{
+		foreach ($params as $name => $value) {
+			if (is_integer($name)) {
+				$this->params[] = $value;
+			}
+			else {
+				$this->params[$name] = $value;
+			}
+		}
+	}
+
 	/**
 	 * Appends a condition to the existing {@link condition}.
 	 * The new condition and the existing condition will be concatenated via the specified operator
@@ -361,157 +373,6 @@ class Query extends CComponent
 	}
 
 	/**
-	 * Merges with another criteria.
-	 * In general, the merging makes the resulting criteria more restrictive.
-	 * For example, if both criterias have conditions, they will be 'AND' together.
-	 * Also, the criteria passed as the parameter takes precedence in case
-	 * two options cannot be merged (e.g. LIMIT, OFFSET).
-	 * @param Query $criteria the criteria to be merged with.
-	 * @param boolean $useAnd whether to use 'AND' to merge condition and having options.
-	 * If false, 'OR' will be used instead. Defaults to 'AND'. This parameter has been
-	 * available since version 1.0.6.
-	 * @since 1.0.5
-	 */
-	public function mergeWith($criteria, $useAnd = true)
-	{
-		$and = $useAnd ? 'AND' : 'OR';
-		if (is_array($criteria))
-			$criteria = new self($criteria);
-		if ($this->select !== $criteria->select)
-		{
-			if ($this->select === '*')
-				$this->select = $criteria->select;
-			elseif ($criteria->select !== '*')
-			{
-				$select1 = is_string($this->select) ? preg_split('/\s*,\s*/', trim($this->select), -1, PREG_SPLIT_NO_EMPTY) : $this->select;
-				$select2 = is_string($criteria->select) ? preg_split('/\s*,\s*/', trim($criteria->select), -1, PREG_SPLIT_NO_EMPTY) : $criteria->select;
-				$this->select = array_merge($select1, array_diff($select2, $select1));
-			}
-		}
-
-		if ($this->condition !== $criteria->condition)
-		{
-			if ($this->condition === '')
-				$this->condition = $criteria->condition;
-			elseif ($criteria->condition !== '')
-				$this->condition = "( {$this->condition}) $and ( {$criteria->condition})";
-		}
-
-		if ($this->params !== $criteria->params)
-			$this->params = array_merge($this->params, $criteria->params);
-
-		if ($criteria->limit > 0)
-			$this->limit = $criteria->limit;
-
-		if ($criteria->offset >= 0)
-			$this->offset = $criteria->offset;
-
-		if ($criteria->alias !== null)
-			$this->alias = $criteria->alias;
-
-		if ($this->order !== $criteria->order)
-		{
-			if ($this->order === '')
-				$this->order = $criteria->order;
-			elseif ($criteria->order !== '')
-				$this->order = $criteria->order . ', ' . $this->order;
-		}
-
-		if ($this->group !== $criteria->group)
-		{
-			if ($this->group === '')
-				$this->group = $criteria->group;
-			elseif ($criteria->group !== '')
-				$this->group .= ', ' . $criteria->group;
-		}
-
-		if ($this->join !== $criteria->join)
-		{
-			if ($this->join === '')
-				$this->join = $criteria->join;
-			elseif ($criteria->join !== '')
-				$this->join .= ' ' . $criteria->join;
-		}
-
-		if ($this->having !== $criteria->having)
-		{
-			if ($this->having === '')
-				$this->having = $criteria->having;
-			elseif ($criteria->having !== '')
-				$this->having = "( {$this->having}) $and ( {$criteria->having})";
-		}
-
-		if ($criteria->distinct > 0)
-			$this->distinct = $criteria->distinct;
-
-		if ($criteria->together !== null)
-			$this->together = $criteria->together;
-
-		if ($criteria->index !== null)
-			$this->index = $criteria->index;
-
-		if (empty($this->scopes))
-			$this->scopes = $criteria->scopes;
-		elseif (!empty($criteria->scopes))
-		{
-			$scopes1 = (array)$this->scopes;
-			$scopes2 = (array)$criteria->scopes;
-			foreach ($scopes1 as $k => $v)
-			{
-				if (is_integer($k))
-					$scopes[] = $v;
-				elseif (isset($scopes2[$k]))
-					$scopes[] = array($k => $v);
-				else
-					$scopes[$k] = $v;
-			}
-			foreach ($scopes2 as $k => $v)
-			{
-				if (is_integer($k))
-					$scopes[] = $v;
-				elseif (isset($scopes1[$k]))
-					$scopes[] = array($k => $v);
-				else
-					$scopes[$k] = $v;
-			}
-			$this->scopes = $scopes;
-		}
-
-		if (empty($this->with))
-			$this->with = $criteria->with;
-		elseif (!empty($criteria->with))
-		{
-			$this->with = (array)$this->with;
-			foreach ((array)$criteria->with as $k => $v)
-			{
-				if (is_integer($k))
-					$this->with[] = $v;
-				elseif (isset($this->with[$k]))
-				{
-					$excludes = array();
-					foreach (array('joinType', 'on') as $opt)
-					{
-						if (isset($this->with[$k][$opt]))
-							$excludes[$opt] = $this->with[$k][$opt];
-						if (isset($v[$opt]))
-							$excludes[$opt] = ($opt === 'on' && isset($excludes[$opt]) && $v[$opt] !== $excludes[$opt]) ?
-								"($excludes[$opt]) AND $v[$opt]" : $v[$opt];
-						unset($this->with[$k][$opt]);
-						unset($v[$opt]);
-					}
-					$this->with[$k] = new self($this->with[$k]);
-					$this->with[$k]->mergeWith($v, $useAnd);
-					$this->with[$k] = $this->with[$k]->toArray();
-					if (count($excludes) !== 0)
-						$this->with[$k] = CMap::mergeArray($this->with[$k], $excludes);
-				}
-				else
-					$this->with[$k] = $v;
-			}
-		}
-	}
-
-	/**
 	 * @return array the array representation of the criteria
 	 * @since 1.0.6
 	 */