- Fixed UNION-behavior with OrderBy and GroupBy

Author: rkrx

src/Builder/Traits/UnionBuilder.php

@@ -30,15 +30,23 @@ public function unionAll($query) {
 	 * @return string
 	 */
 	protected function buildUnions($query) {
-		$qaueries = [$query];
+		$wrap = function ($query) {
+			$query = trim($query);
+			$query = join("\n\t", explode("\n", $query));
+			return sprintf("(\n\t%s\n)", $query);
+		};
+		$queries = [$wrap($query)];
 		foreach($this->unions as $unionQuery) {
 			if($unionQuery[0] === 'ALL') {
-				$qaueries[] = 'UNION ALL';
+				$queries[] = 'UNION ALL';
 			} else {
-				$qaueries[] = 'UNION';
+				$queries[] = 'UNION';
 			}
-			$qaueries[] = $unionQuery[1];
+			$queries[] = $wrap($unionQuery[1]);
 		}
-		return join("\n", $qaueries);
+		if(count($queries) > 1) {
+			return join(" ", $queries);
+		}
+		return $query;
 	}
 }

tests/Builder/SelectTest.php

@@ -190,6 +190,6 @@ public function testSubselectUnion() {
 		->where('t1.id > 10')
 		->asString();
 
-		$this->assertEquals("SELECT\n\tt1.field\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n\nUNION\nSELECT\n\tt1.field\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n", $query);
+		$this->assertEquals("(\n\tSELECT\n\t\tt1.field\n\tFROM\n\t\ttest1 t1\n\tINNER JOIN\n\t\ttest2 t2 ON t1.id=t2.id\n\tWHERE\n\t\t(t1.id > 10)\n) UNION (\n\tSELECT\n\t\tt1.field\n\tFROM\n\t\ttest1 t1\n\tINNER JOIN\n\t\ttest2 t2 ON t1.id=t2.id\n\tWHERE\n\t\t(t1.id > 10)\n)", $query);
 	}
 }