Added unionAll

Author: ackava

src/model/EntityQuery.ts

@@ -177,6 +177,22 @@ export default class EntityQuery<T = any>
         });
     }
 
+    unionAll(... p: any[]) {
+
+        const p1 = Expression.parameter("p1", this.selectStatement.model);
+
+        return new EntityQuery({
+            ... this,
+            selectStatement: {
+                ... this.selectStatement,
+                where: null,
+                joins: null,
+                sourceParameter: p1,
+                source: Expression.unionAll( this.selectStatement, ... p.map((x) => x.selectStatement))
+            },
+        });
+    }
+
     innerJoin(p, fx): any {
 
         const pq = p as EntityQuery<any>;

src/model/IFilterWithParameter.ts

@@ -55,6 +55,8 @@ export interface IBaseQuery<T> {
 
     trace<DT>(this: DT, tracer: (text: string) => void): DT;
 
+    unionAll<DT>(this: DT, ... p: DT[]): DT;
+
     /**
      * Inserts current sql statement into given entity source.
      * @param this query

src/query/ast/ExpressionToSql.ts

@@ -765,16 +765,17 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
     }
 
     visitUnionAllStatement(e: UnionAllStatement): ITextQuery {
-        const all: ITextQuery = [];
+        const all: ITextQuery = ["("];
         let first = true;
         for (const iterator of e.queries) {
-            all.push(this.visit(iterator));
-            if (first) {
+            if (!first) {
+                all.push(" UNION ALL ");
+            } else {
                 first = false;
-                continue;
             }
-            all.push(" UNION ALL ");
+            all.push(this.visit(iterator));
         }
+        all.push(")");
         return all;
     }
 

src/query/ast/Expressions.ts

@@ -103,6 +103,12 @@ export abstract class Expression {
         return BinaryExpression.create({ left, right, operator: "=", assign: true});
     }
 
+    static unionAll(...queries: Expression[]) {
+        return UnionAllStatement.create({
+            queries
+        });
+    }
+
     static create<T extends Expression>(this: IClassOf<T>, p: Partial<Omit<T, "type">>) {
         (p as any).type = (this as any).name;
         Object.setPrototypeOf(p, this.prototype);

src/tests/db-tests/tests/select-union.ts

@@ -0,0 +1,27 @@
+import assert from "assert";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext, headPhoneCategory, maleClothesCategory } from "../../model/createContext.js";
+import IdentityService from "../../../model/identity/IdentityService.js";
+import { User } from "../../model/ShoppingContext.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    context.changeSet.clear();
+
+    const pq = context.productCategories.where({ headPhoneCategory }, (p) => (x) => x.categoryID === p.headPhoneCategory);
+
+    const r = pq
+        .unionAll(context.productCategories.where({ maleClothesCategory }, (p) => (x) => x.category.parentID === p.maleClothesCategory))
+        .trace(console.log);
+
+    const n = await r.count();
+
+    assert(n > 0);
+
+}

src/tests/model/createContext.ts

@@ -154,6 +154,8 @@ function addFemaleClothes(context: ShoppingContext, owner: User) {
     });
 }
 
+
+export const maleClothesCategory = "clothes/male";
 function addMaleClothes(context: ShoppingContext, owner: User) {
     const category = context.categories.add({
         name: "Male Clothes",