Update QueryBuilder.php

Change buildUnion method to be ready to accept parameters in <code>['all' => $all, 'query' => $query]</code> format for division to "UNION" and "UNION ALL" constructions.

Update QueryBuilder.php
7da3449d · Ivan Pomortsev · 5f3d601b · 7da3449d
Commit 7da3449d authored Jan 23, 2014 by Ivan Pomortsev
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

QueryBuilder.php framework/db/QueryBuilder.php +9 -3

No files found.
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -748,9 +748,14 @@ class QueryBuilder extends \yii\base\Object
 		 */
 		$reducer = function($left, $right)
 		{
-			$all = $right->params['all'];
+			if(is_array($left))
-			list($right, $params) = $this->build($right);
+				$left = $left['query'];
-			return $left . ' UNION ' . ($all ? 'ALL ' : ' ') . $right . ' )';
+			$all = false;
+			if(is_array($right)) {
+				$all = $right['all'];
+				$right = $right['query'];
+			}
+			return $left . ' UNION ' . ($all ? 'ALL ' : '') . '( ' . $right . ' )';
 		};
 		foreach ($unions as $i => $union) {
@@ -758,6 +763,7 @@ class QueryBuilder extends \yii\base\Object
 				// save the original parameters so that we can restore them later to prevent from modifying the query object
 				$originalParams = $union->params;
 				$union->addParams($params);
+				list ($unions[$i]['query'], $params) = $this->build($query);
 				$union->params = $originalParams;
 			}
 		}