@entity-access/entity-access 1.0.17 → 1.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/.github/workflows/node.yml +1 -0
  2. package/dist/compiler/QueryCompiler.js +4 -4
  3. package/dist/compiler/QueryCompiler.js.map +1 -1
  4. package/dist/decorators/SchemaRegistry.d.ts +2 -0
  5. package/dist/decorators/SchemaRegistry.d.ts.map +1 -1
  6. package/dist/decorators/SchemaRegistry.js +11 -0
  7. package/dist/decorators/SchemaRegistry.js.map +1 -1
  8. package/dist/decorators/Table.d.ts +3 -1
  9. package/dist/decorators/Table.d.ts.map +1 -1
  10. package/dist/decorators/Table.js +6 -0
  11. package/dist/decorators/Table.js.map +1 -1
  12. package/dist/di/di.d.ts +1 -1
  13. package/dist/di/di.d.ts.map +1 -1
  14. package/dist/di/di.js.map +1 -1
  15. package/dist/drivers/sql-server/ExpressionToSqlServer.js +2 -2
  16. package/dist/drivers/sql-server/ExpressionToSqlServer.js.map +1 -1
  17. package/dist/entity-query/EntityType.d.ts +3 -2
  18. package/dist/entity-query/EntityType.d.ts.map +1 -1
  19. package/dist/entity-query/EntityType.js +3 -2
  20. package/dist/entity-query/EntityType.js.map +1 -1
  21. package/dist/model/verification/VerificationSession.js +3 -3
  22. package/dist/model/verification/VerificationSession.js.map +1 -1
  23. package/dist/query/ast/DebugStringVisitor.js +1 -1
  24. package/dist/query/ast/DebugStringVisitor.js.map +1 -1
  25. package/dist/query/ast/ExpressionToSql.js +5 -5
  26. package/dist/query/ast/ExpressionToSql.js.map +1 -1
  27. package/dist/query/ast/Expressions.d.ts +1 -1
  28. package/dist/query/ast/Expressions.d.ts.map +1 -1
  29. package/dist/query/ast/Expressions.js +1 -1
  30. package/dist/query/ast/Expressions.js.map +1 -1
  31. package/dist/query/expander/QueryExpander.js +3 -3
  32. package/dist/query/expander/QueryExpander.js.map +1 -1
  33. package/dist/tsconfig.tsbuildinfo +1 -1
  34. package/package.json +1 -1
  35. package/src/compiler/QueryCompiler.ts +4 -4
  36. package/src/decorators/SchemaRegistry.ts +13 -0
  37. package/src/decorators/Table.ts +9 -1
  38. package/src/di/di.ts +1 -1
  39. package/src/drivers/sql-server/ExpressionToSqlServer.ts +2 -2
  40. package/src/entity-query/EntityType.ts +3 -2
  41. package/src/model/verification/VerificationSession.ts +3 -3
  42. package/src/query/ast/DebugStringVisitor.ts +1 -1
  43. package/src/query/ast/ExpressionToSql.ts +5 -5
  44. package/src/query/ast/Expressions.ts +1 -1
  45. package/src/query/expander/QueryExpander.ts +5 -5
package/src/query/ast/ExpressionToSql.ts CHANGED
@@ -74,7 +74,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
74
74
  const source = e.source.type === "ValuesStatement"
75
75
  ? prepare `(${this.visit(e.source)})`
76
76
  : this.visit(e.source);
77
- const as = e.as ? prepare ` AS ${this.compiler.quotedLiteral( this.scope.nameOf(e.as))}` : "";
77
+ const as = e.sourceParameter ? prepare ` AS ${this.compiler.quotedLiteral( this.scope.nameOf(e.sourceParameter))}` : "";
78
78
  const fields = this.visitArray(e.fields, ",\n\t\t");
79
79
  return prepare `SELECT
80
80
  ${fields}
@@ -82,8 +82,8 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
82
82
  }
83
83
  prepareStatement(e: SelectStatement) {
84
84
  // inject parameter and types if we don't have it..
85
- if (e.as && e.model) {
86
- this.scope.create({ parameter: e.as, selectStatement: e });
85
+ if (e.sourceParameter && e.model) {
86
+ this.scope.create({ parameter: e.sourceParameter, selectStatement: e });
87
87
  }
88
88
 
89
89
  const joins = e.joins;
@@ -178,8 +178,8 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
178
178
 
179
179
  param1.model = relatedModel;
180
180
  this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
181
- this.scope.alias(param1, select.as, select);
182
- select.as = param1;
181
+ this.scope.alias(param1, select.sourceParameter, select);
182
+ select.sourceParameter = param1;
183
183
  const targetKey = MemberExpression.create({
184
184
  target: parameter,
185
185
  property: Identifier.create({
package/src/query/ast/Expressions.ts CHANGED
@@ -220,7 +220,7 @@ export class SelectStatement extends Expression {
220
220
 
221
221
  source: TableSource | ValuesStatement;
222
222
 
223
- as: ParameterExpression;
223
+ sourceParameter: ParameterExpression;
224
224
 
225
225
  fields: (Expression | QuotedLiteral | ExpressionAs)[];
226
226
 
package/src/query/expander/QueryExpander.ts CHANGED
@@ -91,11 +91,11 @@ export class QueryExpander {
91
91
 
92
92
  joinWhere = Expression.equal(
93
93
  Expression.member(
94
- parent.as,
94
+ parent.sourceParameter,
95
95
  Expression.quotedLiteral(fk.columnName)
96
96
  ),
97
97
  Expression.member(
98
- select.as,
98
+ select.sourceParameter,
99
99
  Expression.quotedLiteral(model.keys[0].columnName)
100
100
  )
101
101
  );
@@ -107,7 +107,7 @@ export class QueryExpander {
107
107
  const joins = (select.joins ??= []);
108
108
  joins.push(JoinExpression.create({
109
109
  source: parent.source as TableSource,
110
- as: parent.as,
110
+ as: parent.sourceParameter,
111
111
  model,
112
112
  where
113
113
  }));
@@ -117,11 +117,11 @@ export class QueryExpander {
117
117
 
118
118
  joinWhere = Expression.equal(
119
119
  Expression.member(
120
- parent.as,
120
+ parent.sourceParameter,
121
121
  Expression.quotedLiteral(fk.columnName)
122
122
  ),
123
123
  Expression.member(
124
- select.as,
124
+ select.sourceParameter,
125
125
  Expression.quotedLiteral(relation.relatedEntity.keys[0].columnName)
126
126
  )
127
127
  );