@entity-access/entity-access 1.0.16 → 1.0.18

package/src/model/verification/VerificationSession.ts

@@ -88,7 +88,7 @@ export default class VerificationSession {
 
         const eq = query as EntityQuery;
         const compare = Expression.equal(
-            Expression.member(eq.selectStatement.as, relatedModel.keys[0].columnName),
+            Expression.member(eq.selectStatement.sourceParameter, relatedModel.keys[0].columnName),
             Expression.constant(value)
         );
         const typeName  = TypeInfo.nameOfType(type);
@@ -106,7 +106,7 @@ export default class VerificationSession {
         const eq = query as EntityQuery;
         for (const [key, value] of keys) {
             const test = Expression.equal(
-                Expression.member(eq.selectStatement.as, Expression.quotedLiteral(key)),
+                Expression.member(eq.selectStatement.sourceParameter, Expression.quotedLiteral(key)),
                 Expression.constant(value)
             );
             compare = compare
@@ -124,7 +124,7 @@ export default class VerificationSession {
         this.select.fields =[
             Expression.as(Expression.templateLiteral(this.field), "error")
         ];
-        this.select.as = ParameterExpression.create({ name: "x"});
+        this.select.sourceParameter = ParameterExpression.create({ name: "x"});
         const source = ValuesStatement.create({
             values: [
                 [Identifier.create({ value: "1"})]

package/src/query/ast/DebugStringVisitor.ts

@@ -156,7 +156,7 @@ export default class DebugStringVisitor extends Visitor<string> {
 
     visitSelectStatement(e: SelectStatement): string {
         const select = `SELECT\n\t${this.visitArray(e.fields, ",\n\t")}\n\tFROM ${this.visit(e.source)}`;
-        const as = e.as ? this.visit(e.as): "";
+        const as = e.sourceParameter ? this.visit(e.sourceParameter): "";
         const joins = e.joins?.length > 0 ? this.visitArray(e.joins, "\n\t") : "";
         const where = e.where ? `\n\tWHERE ${this.visit(e.where)}` : "";
         const orderBy = e.orderBy ? `\n\tORDER BY ${this.visitArray(e.orderBy, "\n\t\tTHEN BY")}`: "";

package/src/query/ast/ExpressionToSql.ts

@@ -74,7 +74,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         const source = e.source.type === "ValuesStatement"
             ? prepare `(${this.visit(e.source)})`
             : this.visit(e.source);
-        const as = e.as ? prepare ` AS ${this.compiler.quotedLiteral( this.scope.nameOf(e.as))}` : "";
+        const as = e.sourceParameter ? prepare ` AS ${this.compiler.quotedLiteral( this.scope.nameOf(e.sourceParameter))}` : "";
         const fields = this.visitArray(e.fields, ",\n\t\t");
         return prepare `SELECT
         ${fields}
@@ -82,8 +82,8 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
     }
     prepareStatement(e: SelectStatement) {
         // inject parameter and types if we don't have it..
-        if (e.as && e.model) {
-            this.scope.create({ parameter: e.as, selectStatement: e });
+        if (e.sourceParameter && e.model) {
+            this.scope.create({ parameter: e.sourceParameter, selectStatement: e });
         }
 
         const joins = e.joins;
@@ -178,8 +178,8 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
 
                             param1.model = relatedModel;
                             this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
-                            this.scope.alias(param1, select.as, select);
-                            select.as = param1;
+                            this.scope.alias(param1, select.sourceParameter, select);
+                            select.sourceParameter = param1;
                             const targetKey = MemberExpression.create({
                                 target: parameter,
                                 property: Identifier.create({

package/src/query/ast/Expressions.ts

@@ -220,7 +220,7 @@ export class SelectStatement extends Expression {
 
     source: TableSource | ValuesStatement;
 
-    as: ParameterExpression;
+    sourceParameter: ParameterExpression;
 
     fields: (Expression | QuotedLiteral | ExpressionAs)[];
 

package/src/query/expander/QueryExpander.ts

@@ -91,11 +91,11 @@ export class QueryExpander {
 
             joinWhere = Expression.equal(
                 Expression.member(
-                    parent.as,
+                    parent.sourceParameter,
                     Expression.quotedLiteral(fk.columnName)
                 ),
                 Expression.member(
-                    select.as,
+                    select.sourceParameter,
                     Expression.quotedLiteral(model.keys[0].columnName)
                 )
             );
@@ -107,7 +107,7 @@ export class QueryExpander {
             const joins = (select.joins ??= []);
             joins.push(JoinExpression.create({
                 source: parent.source as TableSource,
-                as: parent.as,
+                as: parent.sourceParameter,
                 model,
                 where
             }));
@@ -117,11 +117,11 @@ export class QueryExpander {
 
         joinWhere = Expression.equal(
             Expression.member(
-                parent.as,
+                parent.sourceParameter,
                 Expression.quotedLiteral(fk.columnName)
             ),
             Expression.member(
-                select.as,
+                select.sourceParameter,
                 Expression.quotedLiteral(relation.relatedEntity.keys[0].columnName)
             )
         );