@entity-access/entity-access 1.0.417 → 1.0.419

package/src/query/ast/ExpressionToSql.ts

@@ -4,7 +4,7 @@ import EntityType, { IEntityProperty } from "../../entity-query/EntityType.js";
 import EntityQuery from "../../model/EntityQuery.js";
 import { FilteredExpression, filteredSymbol } from "../../model/events/FilteredExpression.js";
 import { NotSupportedError } from "../parser/NotSupportedError.js";
-import { ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, ArrayExpression, BracketExpression, NegateExpression } from "./Expressions.js";
+import { ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionStatement, UpdateStatement, ValuesStatement, NotExpression, ArrayExpression, BracketExpression, NegateExpression } from "./Expressions.js";
 import { ITextQuery, QueryParameter, joinMap, prepare, prepareJoin } from "./IStringTransformer.js";
 import ParameterScope from "./ParameterScope.js";
 import Visitor from "./Visitor.js";
@@ -42,6 +42,11 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         super();
         // this.targets.set(root, { parameter: root });
         // this.targets.set(target, { parameter: target, model: this.source?.type });
+        if (source.scope) {
+            for (const p of source.scope) {
+                this.scope.create({ parameter: p, name: p.name, model: p.model});
+            }
+        }
         if (this.root) {
             this.scope.create({ parameter: root, name: root.name ?? "x", isRuntimeParam: true });
         }
@@ -764,12 +769,13 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         return prepare `EXISTS (${this.visit(e.target)})`;
     }
 
-    visitUnionAllStatement(e: UnionAllStatement): ITextQuery {
+    visitUnionStatement(e: UnionStatement): ITextQuery {
+        const sep = e.all ? " UNION ALL " : " UNION ";
         const all: ITextQuery = ["("];
         let first = true;
         for (const iterator of e.queries) {
             if (!first) {
-                all.push(" UNION ALL ");
+                all.push(sep);
             } else {
                 first = false;
             }

package/src/query/ast/Expressions.ts

@@ -103,9 +103,17 @@ export abstract class Expression {
         return BinaryExpression.create({ left, right, operator: "=", assign: true});
     }
 
+    static union(...queries: Expression[]) {
+        return UnionStatement.create({
+            queries,
+        });
+    }
+
+
     static unionAll(...queries: Expression[]) {
-        return UnionAllStatement.create({
-            queries
+        return UnionStatement.create({
+            queries,
+            all: true
         });
     }
 
@@ -232,9 +240,13 @@ export class BracketExpression extends Expression {
     target: Expression;
 }
 
+let pid = 1;
+const pidSymbol = Symbol("pid");
+
 export class ParameterExpression extends Expression {
     readonly type = "ParameterExpression";
-    name: string;
+
+   name: string;
     /**
      * Default value if any...
      */
@@ -247,6 +259,10 @@ export class ParameterExpression extends Expression {
 
     quotedLiteral: (x: string) => string;
 
+    get id() {
+        return this[pidSymbol] ??= pid++;
+    }
+
     toString() {
         return this.quotedLiteral?.(this.name) ?? this.name;
     }
@@ -450,8 +466,9 @@ export class UpsertStatement extends Expression {
     returnUpdated: ReturnUpdated;
 }
 
-export class UnionAllStatement extends Expression {
-    readonly type = "UnionAllStatement";
+export class UnionStatement extends Expression {
+    readonly type = "UnionStatement";
+    all = false;
     queries: Expression[];
 }
 
@@ -497,7 +514,7 @@ export type ExpressionType =
     ParameterExpression |
     ArrayExpression |
     NotExits |
-    UnionAllStatement |
+    UnionStatement |
     NotExpression |
     NegateExpression |
     BracketExpression |

package/src/query/ast/Visitor.ts

@@ -1,5 +1,5 @@
 import { NotSupportedError } from "../parser/NotSupportedError.js";
-import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, BracketExpression, NegateExpression } from "./Expressions.js";
+import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionStatement, UpdateStatement, ValuesStatement, NotExpression, BracketExpression, NegateExpression } from "./Expressions.js";
 
 
 export default abstract class Visitor<T = any> {
@@ -69,8 +69,8 @@ export default abstract class Visitor<T = any> {
                 return this.visitArrayExpression(e);
             case "NotExists":
                 return this.visitNotExists(e);
-            case "UnionAllStatement":
-                return this.visitUnionAllStatement(e);
+            case "UnionStatement":
+                return this.visitUnionStatement(e);
             case "UpsertStatement":
                 return this.visitUpsertStatement(e);
             case "NotExpression":
@@ -95,7 +95,7 @@ export default abstract class Visitor<T = any> {
     visitUpsertStatement(e: UpsertStatement): T {
         throw new Error("Method not implemented.");
     }
-    visitUnionAllStatement(e: UnionAllStatement): T {
+    visitUnionStatement(e: UnionStatement): T {
         throw new NotSupportedError("Union All");
     }
     visitNotExists(e: NotExits): T {