@entity-access/entity-access 1.0.55 → 1.0.56

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 (127) hide show
  1. package/dist/compiler/NamingConventions.d.ts +7 -0
  2. package/dist/compiler/NamingConventions.d.ts.map +1 -0
  3. package/dist/compiler/NamingConventions.js +7 -0
  4. package/dist/compiler/NamingConventions.js.map +1 -0
  5. package/dist/compiler/QueryCompiler.d.ts +2 -2
  6. package/dist/compiler/QueryCompiler.d.ts.map +1 -1
  7. package/dist/compiler/QueryCompiler.js +8 -3
  8. package/dist/compiler/QueryCompiler.js.map +1 -1
  9. package/dist/decorators/Column.d.ts.map +1 -1
  10. package/dist/decorators/Column.js +3 -0
  11. package/dist/decorators/Column.js.map +1 -1
  12. package/dist/decorators/IColumn.d.ts +5 -0
  13. package/dist/decorators/IColumn.d.ts.map +1 -1
  14. package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
  15. package/dist/drivers/base/BaseDriver.js +7 -7
  16. package/dist/drivers/base/BaseDriver.js.map +1 -1
  17. package/dist/drivers/postgres/PostgreSqlDriver.js +1 -1
  18. package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
  19. package/dist/drivers/sql-server/ExpressionToSqlServer.d.ts.map +1 -1
  20. package/dist/drivers/sql-server/ExpressionToSqlServer.js +2 -2
  21. package/dist/drivers/sql-server/ExpressionToSqlServer.js.map +1 -1
  22. package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts +1 -1
  23. package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts.map +1 -1
  24. package/dist/drivers/sql-server/SqlServerQueryCompiler.js +6 -2
  25. package/dist/drivers/sql-server/SqlServerQueryCompiler.js.map +1 -1
  26. package/dist/entity-query/EntityType.d.ts +7 -5
  27. package/dist/entity-query/EntityType.d.ts.map +1 -1
  28. package/dist/entity-query/EntityType.js +31 -14
  29. package/dist/entity-query/EntityType.js.map +1 -1
  30. package/dist/eternity/EternityStorage.d.ts +1 -1
  31. package/dist/eternity/EternityStorage.d.ts.map +1 -1
  32. package/dist/eternity/EternityStorage.js +4 -4
  33. package/dist/eternity/EternityStorage.js.map +1 -1
  34. package/dist/migrations/Migrations.d.ts.map +1 -1
  35. package/dist/migrations/Migrations.js +5 -4
  36. package/dist/migrations/Migrations.js.map +1 -1
  37. package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map +1 -1
  38. package/dist/migrations/postgres/PostgresAutomaticMigrations.js +17 -14
  39. package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
  40. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +12 -12
  41. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
  42. package/dist/model/EntityContext.js.map +1 -1
  43. package/dist/model/EntityModel.d.ts +4 -1
  44. package/dist/model/EntityModel.d.ts.map +1 -1
  45. package/dist/model/EntityModel.js +36 -5
  46. package/dist/model/EntityModel.js.map +1 -1
  47. package/dist/model/EntityQuery.d.ts.map +1 -1
  48. package/dist/model/EntityQuery.js +7 -7
  49. package/dist/model/EntityQuery.js.map +1 -1
  50. package/dist/model/SourceExpression.d.ts.map +1 -1
  51. package/dist/model/SourceExpression.js +3 -4
  52. package/dist/model/SourceExpression.js.map +1 -1
  53. package/dist/model/changes/ChangeEntry.js +2 -2
  54. package/dist/model/changes/ChangeEntry.js.map +1 -1
  55. package/dist/model/changes/ChangeSet.js +1 -2
  56. package/dist/model/changes/ChangeSet.js.map +1 -1
  57. package/dist/model/verification/VerificationSession.d.ts.map +1 -1
  58. package/dist/model/verification/VerificationSession.js +6 -6
  59. package/dist/model/verification/VerificationSession.js.map +1 -1
  60. package/dist/query/ast/DebugStringVisitor.d.ts +1 -2
  61. package/dist/query/ast/DebugStringVisitor.d.ts.map +1 -1
  62. package/dist/query/ast/DebugStringVisitor.js +0 -3
  63. package/dist/query/ast/DebugStringVisitor.js.map +1 -1
  64. package/dist/query/ast/ExpressionToSql.d.ts +1 -2
  65. package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
  66. package/dist/query/ast/ExpressionToSql.js +16 -14
  67. package/dist/query/ast/ExpressionToSql.js.map +1 -1
  68. package/dist/query/ast/Expressions.d.ts +15 -20
  69. package/dist/query/ast/Expressions.d.ts.map +1 -1
  70. package/dist/query/ast/Expressions.js +17 -19
  71. package/dist/query/ast/Expressions.js.map +1 -1
  72. package/dist/query/ast/IStringTransformer.d.ts +2 -3
  73. package/dist/query/ast/IStringTransformer.d.ts.map +1 -1
  74. package/dist/query/ast/IStringTransformer.js +4 -6
  75. package/dist/query/ast/IStringTransformer.js.map +1 -1
  76. package/dist/query/ast/Visitor.d.ts +1 -2
  77. package/dist/query/ast/Visitor.d.ts.map +1 -1
  78. package/dist/query/ast/Visitor.js +0 -5
  79. package/dist/query/ast/Visitor.js.map +1 -1
  80. package/dist/query/expander/QueryExpander.js +2 -2
  81. package/dist/query/expander/QueryExpander.js.map +1 -1
  82. package/dist/query/parser/ArrowToExpression.d.ts.map +1 -1
  83. package/dist/query/parser/ArrowToExpression.js +2 -2
  84. package/dist/query/parser/ArrowToExpression.js.map +1 -1
  85. package/dist/tests/eternity/eternity-tests.d.ts.map +1 -1
  86. package/dist/tests/eternity/eternity-tests.js +1 -1
  87. package/dist/tests/eternity/eternity-tests.js.map +1 -1
  88. package/dist/tests/expressions/left-joins/child-joins.js +41 -41
  89. package/dist/tests/expressions/left-joins/child-joins.js.map +1 -1
  90. package/dist/tests/expressions/select/select.d.ts.map +1 -1
  91. package/dist/tests/expressions/select/select.js +2 -2
  92. package/dist/tests/expressions/select/select.js.map +1 -1
  93. package/dist/tests/expressions/simple/parse-arrow.js +10 -10
  94. package/dist/tests/expressions/simple/parse-arrow.js.map +1 -1
  95. package/dist/tsconfig.tsbuildinfo +1 -1
  96. package/package.json +1 -1
  97. package/src/compiler/NamingConventions.ts +6 -0
  98. package/src/compiler/QueryCompiler.ts +7 -5
  99. package/src/decorators/Column.ts +3 -0
  100. package/src/decorators/IColumn.ts +7 -0
  101. package/src/drivers/base/BaseDriver.ts +9 -9
  102. package/src/drivers/postgres/PostgreSqlDriver.ts +1 -1
  103. package/src/drivers/sql-server/ExpressionToSqlServer.ts +2 -2
  104. package/src/drivers/sql-server/SqlServerQueryCompiler.ts +5 -2
  105. package/src/entity-query/EntityType.ts +34 -13
  106. package/src/eternity/EternityStorage.ts +3 -3
  107. package/src/migrations/Migrations.ts +5 -3
  108. package/src/migrations/postgres/PostgresAutomaticMigrations.ts +17 -14
  109. package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +12 -12
  110. package/src/model/EntityContext.ts +1 -1
  111. package/src/model/EntityModel.ts +41 -7
  112. package/src/model/EntityQuery.ts +7 -7
  113. package/src/model/SourceExpression.ts +3 -4
  114. package/src/model/changes/ChangeEntry.ts +2 -2
  115. package/src/model/changes/ChangeSet.ts +1 -1
  116. package/src/model/verification/VerificationSession.ts +6 -7
  117. package/src/query/ast/DebugStringVisitor.ts +1 -5
  118. package/src/query/ast/ExpressionToSql.ts +18 -15
  119. package/src/query/ast/Expressions.ts +33 -34
  120. package/src/query/ast/IStringTransformer.ts +4 -4
  121. package/src/query/ast/Visitor.ts +1 -7
  122. package/src/query/expander/QueryExpander.ts +4 -4
  123. package/src/query/parser/ArrowToExpression.ts +2 -2
  124. package/src/tests/eternity/eternity-tests.ts +2 -1
  125. package/src/tests/expressions/left-joins/child-joins.ts +41 -41
  126. package/src/tests/expressions/select/select.ts +2 -5
  127. package/src/tests/expressions/simple/parse-arrow.ts +10 -10
package/dist/eternity/EternityStorage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EternityStorage.js","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EternityStorage.js","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":"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"}
package/dist/migrations/Migrations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Migrations.d.ts","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAG3D,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU;IAExB,SAAS,CAAC,QAAQ,EAAE,aAAa;gBAAvB,QAAQ,EAAE,aAAa;IAEhC,OAAO,CAAC,OAAO,EAAE,aAAa;IAYrC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAgBlF,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAE7E,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;CAGhF"}
1
+ {"version":3,"file":"Migrations.d.ts","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAG3D,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU;IAExB,SAAS,CAAC,QAAQ,EAAE,aAAa;gBAAvB,QAAQ,EAAE,aAAa;IAEhC,OAAO,CAAC,OAAO,EAAE,aAAa;IAarC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAgBlF,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAE7E,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;CAGhF"}
package/dist/migrations/Migrations.js CHANGED
@@ -1,12 +1,13 @@
1
- import SchemaRegistry from "../decorators/SchemaRegistry.js";
1
+ import { modelSymbol } from "../common/symbols/symbols.js";
2
2
  export default class Migrations {
3
3
  compiler;
4
4
  constructor(compiler) {
5
5
  this.compiler = compiler;
6
6
  }
7
7
  async migrate(context) {
8
- for (const iterator of context.model.entities.keys()) {
9
- const type = SchemaRegistry.model(iterator);
8
+ const { model } = context;
9
+ for (const s of model.sources.values()) {
10
+ const type = s[modelSymbol];
10
11
  await this.migrateTable(context, type);
11
12
  for (const index of type.indexes) {
12
13
  await this.migrateIndexInternal(context, index, type);
@@ -20,7 +21,7 @@ export default class Migrations {
20
21
  // parse..
21
22
  const source = context.query(type.typeClass);
22
23
  const { target, textQuery } = this.compiler.compileToSql(source, `(p) => ${index.filter}`);
23
- index.filter = textQuery.join("").split(this.compiler.quotedLiteral(source.selectStatement.sourceParameter.name) + ".").join("");
24
+ index.filter = textQuery.join("").split(source.selectStatement.sourceParameter.name + ".").join("");
24
25
  }
25
26
  this.migrateIndex(context, index, type);
26
27
  }
package/dist/migrations/Migrations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Migrations.js","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAK7D,MAAM,CAAC,OAAO,OAAgB,UAAU;IAEd;IAAtB,YAAsB,QAAuB;QAAvB,aAAQ,GAAR,QAAQ,CAAe;IAAG,CAAC;IAE1C,KAAK,CAAC,OAAO,CAAC,OAAsB;QACvC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE;YAClD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEvC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;gBAC9B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aACzD;SACJ;IAEL,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAAsB,EAAE,KAAa,EAAE,IAAgB;QAC9E,6BAA6B;QAE7B,KAAK,GAAG,EAAE,GAAI,KAAK,EAAE,CAAC;QAEtB,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE;YAClD,UAAU;YACV,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAqB,CAAC;YACjE,MAAM,EAAE,MAAM,EAAG,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,KAAK,CAAC,MAAM,EAAS,CAAC,CAAC;YACnG,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrI;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAE5C,CAAC;CAOJ"}
1
+ {"version":3,"file":"Migrations.js","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAQ3D,MAAM,CAAC,OAAO,OAAgB,UAAU;IAEd;IAAtB,YAAsB,QAAuB;QAAvB,aAAQ,GAAR,QAAQ,CAAe;IAAG,CAAC;IAE1C,KAAK,CAAC,OAAO,CAAC,OAAsB;QACvC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;YACpC,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,CAAe,CAAC;YAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEvC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;gBAC9B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aACzD;SACJ;IAEL,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAAsB,EAAE,KAAa,EAAE,IAAgB;QAC9E,6BAA6B;QAE7B,KAAK,GAAG,EAAE,GAAI,KAAK,EAAE,CAAC;QAEtB,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE;YAClD,UAAU;YACV,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAqB,CAAC;YACjE,MAAM,EAAE,MAAM,EAAG,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,KAAK,CAAC,MAAM,EAAS,CAAC,CAAC;YACnG,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAE,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACxG;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAE5C,CAAC;CAOJ"}
package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAEzD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEjE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU;IAiBrD,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAc5E,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IAyB5E,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IA2BjE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;CAmB7E"}
1
+ {"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAEzD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEjE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU;IAiBrD,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAc5E,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IAyB5E,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IA8BjE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;CAmB7E"}
package/dist/migrations/postgres/PostgresAutomaticMigrations.js CHANGED
@@ -12,7 +12,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
12
12
  async createIndexes(context, type, fkColumns) {
13
13
  for (const iterator of fkColumns) {
14
14
  const filter = iterator.nullable
15
- ? `${JSON.stringify(iterator.columnName)} IS NOT NULL`
15
+ ? `${iterator.columnName} IS NOT NULL`
16
16
  : "";
17
17
  const indexDef = {
18
18
  name: `IX_${type.name}_${iterator.columnName}`,
@@ -24,13 +24,13 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
24
24
  }
25
25
  async createColumns(driver, type, nonKeyColumns) {
26
26
  const name = type.schema
27
- ? JSON.stringify(type.schema) + "." + JSON.stringify(type.name)
28
- : JSON.stringify(type.name);
27
+ ? type.schema + "." + type.name
28
+ : type.name;
29
29
  if (nonKeyColumns.length > 1) {
30
30
  nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
31
31
  }
32
32
  for (const iterator of nonKeyColumns) {
33
- const columnName = JSON.stringify(iterator.columnName);
33
+ const columnName = iterator.columnName;
34
34
  let def = `ALTER TABLE ${name} ADD COLUMN IF NOT EXISTS ${columnName} `;
35
35
  def += this.getColumnDefinition(iterator);
36
36
  if (iterator.nullable !== true) {
@@ -44,34 +44,37 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
44
44
  }
45
45
  async createTable(driver, type, keys) {
46
46
  const name = type.schema
47
- ? JSON.stringify(type.schema) + "." + JSON.stringify(type.name)
48
- : JSON.stringify(type.name);
47
+ ? type.schema + "." + type.name
48
+ : type.name;
49
49
  if (keys.length > 1) {
50
50
  keys.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
51
51
  }
52
52
  const fields = [];
53
53
  for (const iterator of keys) {
54
- let def = JSON.stringify(iterator.columnName) + " ";
54
+ let def = iterator.columnName + " ";
55
55
  if (iterator.autoGenerate) {
56
- def += iterator.dataType === "BigInt" ? "bigserial " : "serial ";
56
+ def += iterator.dataType === "BigInt" ? "bigint " : "int ";
57
+ def += " not null GENERATED BY DEFAULT AS IDENTITY\r\n\t";
57
58
  }
58
59
  else {
59
60
  def += this.getColumnDefinition(iterator);
61
+ def += " not null \r\n\t";
60
62
  }
61
- def += " not null primary key\r\n\t";
62
63
  fields.push(def);
63
64
  }
64
- await driver.executeQuery(`CREATE TABLE IF NOT EXISTS ${name} (${fields.join(",")})`);
65
+ await driver.executeQuery(`CREATE TABLE IF NOT EXISTS ${name} (${fields.join(",")}
66
+ ,CONSTRAINT PK_${name} PRIMARY KEY (${keys.map((x) => x.columnName).join(",")})
67
+ )`);
65
68
  }
66
69
  async migrateIndex(context, index, type) {
67
70
  const driver = context.driver;
68
71
  const name = type.schema
69
- ? JSON.stringify(type.schema) + "." + JSON.stringify(type.name)
70
- : JSON.stringify(type.name);
71
- const indexName = JSON.stringify(index.name);
72
+ ? type.schema + "." + type.name
73
+ : type.name;
74
+ const indexName = index.name;
72
75
  const columns = [];
73
76
  for (const column of index.columns) {
74
- const columnName = JSON.stringify(column.name);
77
+ const columnName = column.name;
75
78
  columns.push(`${columnName} ${column.descending ? "DESC" : "ASC"}`);
76
79
  }
77
80
  let query = `CREATE ${index.unique ? "UNIQUE" : ""} INDEX IF NOT EXISTS ${indexName} ON ${name} ( ${columns.join(", ")})`;
package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js CHANGED
@@ -13,10 +13,10 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
13
13
  async createIndexes(context, type, fkColumns) {
14
14
  for (const iterator of fkColumns) {
15
15
  const filter = iterator.nullable
16
- ? `${SqlServerLiteral.quotedLiteral(iterator.columnName)} IS NOT NULL`
16
+ ? `${iterator.columnName} IS NOT NULL`
17
17
  : "";
18
18
  const indexDef = {
19
- name: `IX_${type.name}_${iterator.columnName}`,
19
+ name: `IX_${type.name}_${iterator.name}`,
20
20
  columns: [{ name: iterator.columnName, descending: iterator.indexOrder !== "ascending" }],
21
21
  filter
22
22
  };
@@ -25,13 +25,13 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
25
25
  }
26
26
  async createColumns(driver, type, nonKeyColumns) {
27
27
  const name = type.schema
28
- ? SqlServerLiteral.quotedLiteral(type.schema) + "." + SqlServerLiteral.quotedLiteral(type.name)
29
- : SqlServerLiteral.quotedLiteral(type.name);
28
+ ? type.schema + "." + type.name
29
+ : type.name;
30
30
  if (nonKeyColumns.length > 1) {
31
31
  nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
32
32
  }
33
33
  for (const iterator of nonKeyColumns) {
34
- const columnName = SqlServerLiteral.quotedLiteral(iterator.columnName);
34
+ const columnName = iterator.columnName;
35
35
  let def = `IF COL_LENGTH(${SqlServerLiteral.escapeLiteral(name)}, ${SqlServerLiteral.escapeLiteral(columnName)}) IS NULL ALTER TABLE ${name} ADD ${columnName} `;
36
36
  def += this.getColumnDefinition(iterator);
37
37
  if (iterator.nullable === true) {
@@ -48,14 +48,14 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
48
48
  }
49
49
  async createTable(driver, type, keys) {
50
50
  const name = type.schema
51
- ? SqlServerLiteral.quotedLiteral(type.schema) + "." + SqlServerLiteral.quotedLiteral(type.name)
52
- : SqlServerLiteral.quotedLiteral(type.name);
51
+ ? type.schema + "." + type.name
52
+ : type.name;
53
53
  if (keys.length > 1) {
54
54
  keys.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
55
55
  }
56
56
  const fields = [];
57
57
  for (const iterator of keys) {
58
- let def = SqlServerLiteral.quotedLiteral(iterator.columnName) + " ";
58
+ let def = iterator.columnName + " ";
59
59
  if (iterator.autoGenerate) {
60
60
  def += this.getColumnDefinition(iterator) + " IDENTITY(1,1)";
61
61
  }
@@ -72,12 +72,12 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
72
72
  async migrateIndex(context, index, type) {
73
73
  const driver = context.driver;
74
74
  const name = type.schema
75
- ? SqlServerLiteral.quotedLiteral(type.schema) + "." + SqlServerLiteral.quotedLiteral(type.name)
76
- : SqlServerLiteral.quotedLiteral(type.name);
77
- const indexName = SqlServerLiteral.quotedLiteral(index.name);
75
+ ? type.schema + "." + type.name
76
+ : type.name;
77
+ const indexName = index.name;
78
78
  const columns = [];
79
79
  for (const column of index.columns) {
80
- const columnName = SqlServerLiteral.quotedLiteral(column.name);
80
+ const columnName = column.name;
81
81
  columns.push(`${columnName} ${column.descending ? "DESC" : "ASC"}`);
82
82
  }
83
83
  let query = `IF NOT EXISTS(SELECT * FROM sys.indexes WHERE name = '${indexName}' AND object_id = OBJECT_ID('${name}'))
package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}
package/dist/model/EntityContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityContext.js","sourceRoot":"","sources":["../../src/model/EntityContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityContext.js","sourceRoot":"","sources":["../../src/model/EntityContext.ts"],"names":[],"mappings":"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"}
package/dist/model/EntityModel.d.ts CHANGED
@@ -1,10 +1,13 @@
1
1
  import type EntityContext from "./EntityContext.js";
2
2
  import { IClassOf } from "../decorators/IClassOf.js";
3
3
  import { EntitySource } from "./EntitySource.js";
4
+ import EntityType from "../entity-query/EntityType.js";
4
5
  export default class EntityModel {
5
6
  private context;
6
- entities: Map<IClassOf<any>, EntitySource>;
7
+ sources: Map<IClassOf<any>, EntitySource>;
8
+ types: Map<IClassOf<any>, EntityType>;
7
9
  constructor(context: EntityContext);
8
10
  register<T>(type: IClassOf<T>): EntitySource<T>;
11
+ getEntityType<T>(type: IClassOf<T>): EntityType;
9
12
  }
10
13
  //# sourceMappingURL=EntityModel.d.ts.map
package/dist/model/EntityModel.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityModel.d.ts","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,WAAW;IAIhB,OAAO,CAAC,OAAO;IAFpB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAa;gBAE1C,OAAO,EAAE,aAAa;IAG1C,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;CAUhC"}
1
+ {"version":3,"file":"EntityModel.d.ts","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,UAAU,MAAM,+BAA+B,CAAC;AA8BvD,MAAM,CAAC,OAAO,OAAO,WAAW;IAMhB,OAAO,CAAC,OAAO;IAJpB,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAa;IAEtD,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAa;gBAErC,OAAO,EAAE,aAAa;IAG1C,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAY7B,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU;CAIlD"}
package/dist/model/EntityModel.js CHANGED
@@ -1,19 +1,50 @@
1
1
  import SchemaRegistry from "../decorators/SchemaRegistry.js";
2
2
  import { EntitySource } from "./EntitySource.js";
3
+ import EntityType from "../entity-query/EntityType.js";
4
+ const driverModelCache = Symbol("driverModelCache");
5
+ const getOrCreateModel = (map, type, namingConvention) => {
6
+ let t = map.get(type);
7
+ if (t) {
8
+ return t;
9
+ }
10
+ const original = SchemaRegistry.model(type);
11
+ t = new EntityType(original);
12
+ map.set(type, t);
13
+ for (const iterator of original.columns) {
14
+ const column = { ...iterator };
15
+ column.columnName = column.explicitName ? column.columnName : (namingConvention ? namingConvention(column.columnName) : column.columnName);
16
+ t.addColumn(column);
17
+ column.entityType = t;
18
+ }
19
+ for (const iterator of original.relations) {
20
+ if (iterator.isInverseRelation) {
21
+ continue;
22
+ }
23
+ const relation = { ...iterator, fkColumn: void 0, relatedEntity: void 0, type: t };
24
+ t.addRelation(relation, (tc) => getOrCreateModel(map, tc, namingConvention));
25
+ }
26
+ return t;
27
+ };
3
28
  export default class EntityModel {
4
29
  context;
5
- entities = new Map();
30
+ sources = new Map();
31
+ types = new Map();
6
32
  constructor(context) {
7
33
  this.context = context;
8
34
  }
9
35
  register(type) {
10
- let source = this.entities.get(type);
36
+ let source = this.sources.get(type);
11
37
  if (!source) {
12
- const model = SchemaRegistry.model(type);
13
- source = new EntitySource(model, this.context);
14
- this.entities.set(type, source);
38
+ const cache = (this.context.driver[driverModelCache] ??= new Map());
39
+ const entityType = getOrCreateModel(cache, type, this.context.driver.compiler.namingConvention);
40
+ this.types.set(type, entityType);
41
+ source = new EntitySource(entityType, this.context);
42
+ this.sources.set(type, source);
15
43
  }
16
44
  return source;
17
45
  }
46
+ getEntityType(type) {
47
+ return this.types.get(type);
48
+ }
18
49
  }
19
50
  //# sourceMappingURL=EntityModel.js.map
package/dist/model/EntityModel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,WAAW;IAIR;IAFb,QAAQ,GAAqC,IAAI,GAAG,EAAE,CAAC;IAE9D,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAC1C,CAAC;IAED,QAAQ,CAAI,IAAiB;QACzB,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,GAAG,IAAI,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACnC;QACD,OAAO,MAAyB,CAAC;IACrC,CAAC;CAEJ"}
1
+ {"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"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"}
package/dist/model/EntityQuery.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAGzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA0F,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEtJ,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CACpC,YAAW,mBAAmB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,UAAU,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;gBACf,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAMzB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;IAIpC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAGrC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;IAIzC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,GAAG;IAQ7D,OAAO,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG;IAQd,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAQtB,SAAS,IAAI,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC;IA6C7C,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW;IAiBlG,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC;IAOzB,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC;IAMzB,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAG3C,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAQtC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAUhD,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIrB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIhB,KAAK,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BvD,OAAO,CAAC,MAAM;CAMjB"}
1
+ {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAGzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA2E,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEvI,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CACpC,YAAW,mBAAmB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,UAAU,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;gBACf,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAMzB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;IAIpC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAGrC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;IAIzC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,GAAG;IAQ7D,OAAO,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG;IAQd,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAQtB,SAAS,IAAI,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC;IA6C7C,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW;IAiBlG,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC;IAOzB,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC;IAMzB,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAG3C,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAQtC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAUhD,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIrB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIhB,KAAK,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BvD,OAAO,CAAC,MAAM;CAMjB"}
package/dist/model/EntityQuery.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import Logger from "../common/Logger.js";
2
2
  import { DisposableScope } from "../common/usingAsync.js";
3
- import { CallExpression, Expression, ExpressionAs, Identifier, OrderByExpression, QuotedLiteral } from "../query/ast/Expressions.js";
3
+ import { CallExpression, Expression, ExpressionAs, Identifier, OrderByExpression } from "../query/ast/Expressions.js";
4
4
  import { QueryExpander } from "../query/expander/QueryExpander.js";
5
5
  import { filteredSymbol } from "./events/EntityEvents.js";
6
6
  import RelationMapper from "./identity/RelationMapper.js";
@@ -74,9 +74,9 @@ export default class EntityQuery {
74
74
  scope.register(reader);
75
75
  for await (const iterator of reader.next(10, signal)) {
76
76
  if (type) {
77
- Object.setPrototypeOf(iterator, type.typeClass.prototype);
77
+ const item = type?.map(iterator) ?? iterator;
78
78
  // set identity...
79
- const entry = this.context.changeSet.getEntry(iterator, iterator);
79
+ const entry = this.context.changeSet.getEntry(item, item);
80
80
  relationMapper.fix(entry);
81
81
  yield entry.entity;
82
82
  continue;
@@ -97,8 +97,8 @@ export default class EntityQuery {
97
97
  const reader = await this.context.driver.executeReader(query, signal);
98
98
  try {
99
99
  for await (const iterator of reader.next(10, signal)) {
100
- Object.setPrototypeOf(iterator, select.model.typeClass.prototype);
101
- const entry = this.context.changeSet.getEntry(iterator, iterator);
100
+ const item = select.model?.map(iterator) ?? iterator;
101
+ const entry = this.context.changeSet.getEntry(item, item);
102
102
  relationMapper.fix(entry);
103
103
  }
104
104
  }
@@ -158,7 +158,7 @@ export default class EntityQuery {
158
158
  callee: Identifier.create({ value: "COUNT" }),
159
159
  arguments: [Identifier.create({ value: "*" })]
160
160
  }),
161
- alias: QuotedLiteral.create({ literal: "count" })
161
+ alias: Expression.identifier("c1")
162
162
  })
163
163
  ] };
164
164
  const nq = new EntityQuery({ ...this, selectStatement: select });
@@ -166,7 +166,7 @@ export default class EntityQuery {
166
166
  const reader = await this.context.driver.executeReader(query);
167
167
  try {
168
168
  for await (const iterator of reader.next()) {
169
- return iterator.count;
169
+ return iterator.c1;
170
170
  }
171
171
  }
172
172
  finally {
package/dist/model/EntityQuery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
package/dist/model/SourceExpression.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SourceExpression.d.ts","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA4F,mBAAmB,EAAiB,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC5L,OAAO,EAAE,kBAAkB,EAAkB,MAAM,oCAAoC,CAAC;AACxF,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAI/C,qBAAa,gBAAgB;WAEX,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAIjD,KAAK,EAAE,mBAAmB,CAAC;IAC3B,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B,OAAO,CAAC,GAAG,CAA+B;IAC1C,OAAO,CAAC,QAAQ,CAAgC;IAEhD,OAAO;IAaP,IAAI;IASJ,OAAO,CAAC,QAAQ,EAAE,MAAM;IAkCxB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB;IA4B3D,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB;IAY5C,YAAY,CAAC,CAAC,QAAQ,EAAG,GAAI,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,kBAAkB;CAWtE"}
1
+ {"version":3,"file":"SourceExpression.d.ts","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA8B,mBAAmB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC/G,OAAO,EAAE,kBAAkB,EAAkB,MAAM,oCAAoC,CAAC;AACxF,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAI/C,qBAAa,gBAAgB;WAEX,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAIjD,KAAK,EAAE,mBAAmB,CAAC;IAC3B,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B,OAAO,CAAC,GAAG,CAA+B;IAC1C,OAAO,CAAC,QAAQ,CAAgC;IAEhD,OAAO;IAaP,IAAI;IASJ,OAAO,CAAC,QAAQ,EAAE,MAAM;IAkCxB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB;IA4B3D,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB;IAY5C,YAAY,CAAC,CAAC,QAAQ,EAAG,GAAI,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,kBAAkB;CAUtE"}
package/dist/model/SourceExpression.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { modelSymbol } from "../common/symbols/symbols.js";
2
- import { Expression, JoinExpression, ParameterExpression, QuotedLiteral } from "../query/ast/Expressions.js";
2
+ import { Expression, JoinExpression, ParameterExpression } from "../query/ast/Expressions.js";
3
3
  import { QueryParameter } from "../query/ast/IStringTransformer.js";
4
4
  const sourceSymbol = Symbol("source");
5
5
  export class SourceExpression {
@@ -53,7 +53,7 @@ export class SourceExpression {
53
53
  as: source.alias,
54
54
  joinType: column.nullable ? "LEFT" : "INNER",
55
55
  model,
56
- source: QuotedLiteral.create({ literal: model.name }),
56
+ source: Expression.identifier(model.name),
57
57
  where: Expression.logicalAnd(Expression.member(this.alias, column.columnName), Expression.member(source.alias, model.keys[0].columnName))
58
58
  });
59
59
  select.joins.push(join);
@@ -97,9 +97,8 @@ export class SourceExpression {
97
97
  }
98
98
  prepareNames([property, ...others]) {
99
99
  const p = this.model.getProperty(property);
100
- const quotedLiteral = this.context.driver.compiler.quotedLiteral;
101
100
  if (others.length === 0) {
102
- return `${QueryParameter.create(() => this.alias.name, quotedLiteral)}.${quotedLiteral(p.field.columnName)}`;
101
+ return `${QueryParameter.create(() => this.alias.name)}.${p.field.columnName}`;
103
102
  }
104
103
  // this must be a navigation...
105
104
  const source = this.addJoin(property);
package/dist/model/SourceExpression.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SourceExpression.js","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SourceExpression.js","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"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"}
package/dist/model/changes/ChangeEntry.js CHANGED
@@ -55,9 +55,9 @@ export default class ChangeEntry {
55
55
  }
56
56
  this.detectDependencies();
57
57
  for (const iterator of columns) {
58
- const oldValue = original[iterator.columnName];
58
+ const oldValue = original[iterator.name];
59
59
  const newValue = entity[iterator.name];
60
- if (entity[iterator.name] !== original[iterator.columnName]) {
60
+ if (entity[iterator.name] !== original[iterator.name]) {
61
61
  let modifiedEntry = this.modified.get(iterator);
62
62
  if (!modifiedEntry) {
63
63
  modifiedEntry = { column: iterator, oldValue, newValue };
package/dist/model/changes/ChangeEntry.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ChangeEntry.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ChangeEntry.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"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"}