@entity-access/entity-access 1.0.460 → 1.0.462

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 (39) hide show
  1. package/dist/decorators/IColumn.d.ts +3 -0
  2. package/dist/decorators/IColumn.d.ts.map +1 -1
  3. package/dist/decorators/IForeignKeyConstraint.d.ts +1 -1
  4. package/dist/decorators/IForeignKeyConstraint.d.ts.map +1 -1
  5. package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
  6. package/dist/drivers/base/BaseDriver.js +13 -14
  7. package/dist/drivers/base/BaseDriver.js.map +1 -1
  8. package/dist/entity-query/EntityType.js +2 -2
  9. package/dist/entity-query/EntityType.js.map +1 -1
  10. package/dist/migrations/postgres/PostgresAutomaticMigrations.js +1 -1
  11. package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
  12. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +7 -7
  13. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
  14. package/dist/model/EntityModel.d.ts.map +1 -1
  15. package/dist/model/EntityModel.js +3 -0
  16. package/dist/model/EntityModel.js.map +1 -1
  17. package/dist/model/EntityQuery.js +8 -8
  18. package/dist/model/EntityQuery.js.map +1 -1
  19. package/dist/model/EntitySource.js +1 -2
  20. package/dist/model/EntitySource.js.map +1 -1
  21. package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
  22. package/dist/query/ast/ExpressionToSql.js +9 -36
  23. package/dist/query/ast/ExpressionToSql.js.map +1 -1
  24. package/dist/query/expander/QueryExpander.js +2 -2
  25. package/dist/query/expander/QueryExpander.js.map +1 -1
  26. package/dist/tsconfig.tsbuildinfo +1 -1
  27. package/package.json +1 -1
  28. package/src/decorators/IColumn.ts +4 -0
  29. package/src/decorators/IForeignKeyConstraint.ts +1 -1
  30. package/src/drivers/base/BaseDriver.ts +12 -13
  31. package/src/entity-query/EntityType.ts +2 -2
  32. package/src/migrations/postgres/PostgresAutomaticMigrations.ts +1 -1
  33. package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +7 -7
  34. package/src/model/EntityModel.ts +3 -0
  35. package/src/model/EntityQuery.ts +11 -11
  36. package/src/model/EntitySource.ts +1 -1
  37. package/src/query/ast/ExpressionToSql.ts +10 -37
  38. package/src/query/expander/QueryExpander.ts +4 -4
  39. package/test.js +10 -4
package/dist/decorators/IColumn.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import EntityType from "../entity-query/EntityType.js";
2
+ import type { Identifier } from "../query/ast/Expressions.js";
2
3
  import { IClassOf } from "./IClassOf.js";
3
4
  import { IForeignKeyConstraint } from "./IForeignKeyConstraint.js";
4
5
  import { ISqlType } from "./ISqlType.js";
@@ -16,6 +17,8 @@ export interface IColumn {
16
17
  formattedName?: string;
17
18
  quotedName?: string;
18
19
  quotedColumnName?: string;
20
+ quotedNameExp?: Identifier;
21
+ quotedColumnNameExp?: Identifier;
19
22
  order?: number;
20
23
  key?: boolean;
21
24
  /**
package/dist/decorators/IColumn.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtE,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAE;IAEhC;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,qBAAqB,CAAC,MAAA;IAKtB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,uBAAuB,CAAC,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9C,KAAK,EAAE,MAAM,EAAE,CAAC;IAGhB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAEhD"}
1
+ {"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtE,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,mBAAmB,CAAC,EAAE,UAAU,CAAC;IAEjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAE;IAEhC;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,qBAAqB,CAAC,MAAA;IAKtB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,uBAAuB,CAAC,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9C,KAAK,EAAE,MAAM,EAAE,CAAC;IAGhB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAEhD"}
package/dist/decorators/IForeignKeyConstraint.d.ts CHANGED
@@ -6,7 +6,7 @@ export interface IForeignKeyConstraint {
6
6
  validate?: boolean;
7
7
  index?: boolean;
8
8
  onDelete?: "cascade" | "restrict" | "set-null" | "set-default";
9
- doNotClearExisting?: boolean;
9
+ clearExisting?: boolean;
10
10
  fkMap?: FKType[];
11
11
  }
12
12
  //# sourceMappingURL=IForeignKeyConstraint.d.ts.map
package/dist/decorators/IForeignKeyConstraint.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IForeignKeyConstraint.d.ts","sourceRoot":"","sources":["../../src/decorators/IForeignKeyConstraint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAW,MAAM,cAAc,CAAC;AAG/C,MAAM,WAAW,qBAAqB;IAElC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,aAAa,CAAC;IAE/D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB"}
1
+ {"version":3,"file":"IForeignKeyConstraint.d.ts","sourceRoot":"","sources":["../../src/decorators/IForeignKeyConstraint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAW,MAAM,cAAc,CAAC;AAG/C,MAAM,WAAW,qBAAqB;IAElC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,aAAa,CAAC;IAE/D,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB"}
package/dist/drivers/base/BaseDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"AAGA,OAAO,6BAA6B,CAAC;AAErC,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,WAAW,EAAE,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAA8B,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAiB,eAAe,EAAgB,eAAe,EAAoC,MAAM,gCAAgC,CAAC;AAEvO,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACtB,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,KAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;CAE3D,CAAC;AAEX,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,QAAA,MAAM,kBAAkB,eAA+B,CAAC;AAExD,8BAAsB,iBAAiB;IAOvB,SAAS,CAAC,IAAI,EAAE,cAAc;IAL1C,OAAO,CAAC,qBAAqB,CAAS;IAEtC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAoB;gBAET,IAAI,EAAE,cAAc;IAM1C,KAAK;IAIC,MAAM;IASN,QAAQ;IASd,IAAI,CAAC,EAAE,KAAA;IAIP,UAAU,CAAC,EAAE,KAAA;IAIP,OAAO;IAYb,CAAC,MAAM,CAAC,YAAY,CAAC;IAIrB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAEvD;AAiCD,8BAAsB,cAAc;IAab,MAAM,EAAE,UAAU;IAXrC,IAAW,kBAAkB,sBAE5B;IAED,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAElC,SAAS,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;IAEhD,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAoB;gBAG7B,MAAM,EAAE,UAAU;aAKrB,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAE9C;;;OAGG;aACa,mBAAmB,IAAI,UAAU;IAEpC,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;aAQ5C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;aAExE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAE7E,iBAAiB;IAW9B,SAAS,CAAC,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAEvE;AAED,MAAM,MAAM,cAAc;AAC1B;;GAEG;AACC,QAAQ;AACZ;;GAEG;AACC,QAAQ;AACZ;;GAEG;AACC,QAAQ;AACZ;;GAEG;AACH,gBAAgB;AAChB;2CAC2C;AAC3C,QAAQ,CAAC;AAET,8BAAsB,UAAU;aAIA,gBAAgB,EAAE,mBAAmB;IAHjE,QAAQ,KAAK,QAAQ,IAAI,aAAa,CAAC;gBAGX,gBAAgB,EAAE,mBAAmB;IAEjE,QAAQ,CAAC,aAAa,IAAI,cAAc;IAExC,+BAA+B;IAC/B,QAAQ,CAAC,OAAO;IAEhB,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,KAAA,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAA;KAAE;IAE/E,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAyGzH,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAe5E,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,KAAA,EAAE,IAAI,CAAC,KAAA;;;;IAgDnD,8BAA8B,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,UAAU,EAAE;IAuBvF,sBAAsB,CAClB,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,GAAG,EACX,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,GAAG,EACT,YAAY,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU;IAqH5C,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,eAAe;IAkCtE,sBAAsB,CAAC,KAAK,EAAE,WAAW;IAqCzC,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG;CA0BvD"}
1
+ {"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"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"}
package/dist/drivers/base/BaseDriver.js CHANGED
@@ -2,7 +2,7 @@ import { __addDisposableResource, __disposeResources } from "tslib";
2
2
  import EntityAccessError from "../../common/EntityAccessError.js";
3
3
  // Making sure that Symbol.dispose is not undefined
4
4
  import "../../common/IDisposable.js";
5
- import { BinaryExpression, Constant, DeleteStatement, Expression, Identifier, InsertStatement, ReturnUpdated, SelectStatement, TableLiteral, UpdateStatement, UpsertStatement, ValuesStatement } from "../../query/ast/Expressions.js";
5
+ import { BinaryExpression, Constant, DeleteStatement, Expression, InsertStatement, ReturnUpdated, SelectStatement, TableLiteral, UpdateStatement, UpsertStatement, ValuesStatement } from "../../query/ast/Expressions.js";
6
6
  export const toQuery = (text) => typeof text === "string"
7
7
  ? { text, values: [] }
8
8
  : text;
@@ -303,7 +303,7 @@ export class BaseDriver {
303
303
  for (const key in check) {
304
304
  if (Object.prototype.hasOwnProperty.call(check, key)) {
305
305
  const element = check[key];
306
- const column = Expression.identifier(type.getField(key).columnName);
306
+ const column = type.getField(key).quotedColumnNameExp;
307
307
  const condition = Expression.equal(column, Expression.constant(element));
308
308
  where = where
309
309
  ? Expression.logicalAnd(where, condition)
@@ -325,8 +325,8 @@ export class BaseDriver {
325
325
  for (const key in test) {
326
326
  if (Object.prototype.hasOwnProperty.call(test, key)) {
327
327
  const element = test[key];
328
- const { columnName } = type.getField(key);
329
- const compare = Expression.equal(Expression.identifier(columnName), Expression.constant(element));
328
+ const { quotedColumnNameExp } = type.getField(key);
329
+ const compare = Expression.equal(quotedColumnNameExp, Expression.constant(element));
330
330
  where = where
331
331
  ? Expression.logicalAnd(where, compare)
332
332
  : compare;
@@ -349,7 +349,7 @@ export class BaseDriver {
349
349
  if (value === void 0 || iterator.generated) {
350
350
  continue;
351
351
  }
352
- fields.push(Expression.identifier(iterator.columnName));
352
+ fields.push(iterator.quotedColumnNameExp);
353
353
  values.push(Expression.constant(value));
354
354
  }
355
355
  return InsertStatement.create({
@@ -372,7 +372,7 @@ export class BaseDriver {
372
372
  if (value === void 0 || iterator.generated) {
373
373
  continue;
374
374
  }
375
- const assign = Expression.assign(Expression.identifier(iterator.columnName), Expression.constant(value));
375
+ const assign = Expression.assign(iterator.quotedColumnNameExp, Expression.constant(value));
376
376
  if (iterator.key) {
377
377
  insert.push(assign);
378
378
  if (!test) {
@@ -387,8 +387,8 @@ export class BaseDriver {
387
387
  for (const key in test) {
388
388
  if (Object.prototype.hasOwnProperty.call(test, key)) {
389
389
  const element = test[key];
390
- const { columnName } = type.getField(key);
391
- keys.push(Expression.equal(Expression.identifier(columnName), Expression.constant(element)));
390
+ const { quotedColumnNameExp } = type.getField(key);
391
+ keys.push(Expression.equal(quotedColumnNameExp, Expression.constant(element)));
392
392
  }
393
393
  }
394
394
  }
@@ -425,16 +425,15 @@ export class BaseDriver {
425
425
  const fields = [];
426
426
  const values = [];
427
427
  for (const iterator of type.columns) {
428
- const literal = Identifier.create({ value: iterator.columnName });
429
428
  if (iterator.generated) {
430
- returnFields.push(literal);
429
+ returnFields.push(iterator.quotedColumnNameExp);
431
430
  continue;
432
431
  }
433
432
  const value = entity[iterator.name];
434
433
  if (value === void 0) {
435
434
  continue;
436
435
  }
437
- fields.push(literal);
436
+ fields.push(iterator.quotedColumnNameExp);
438
437
  values.push(Constant.create({ value }));
439
438
  }
440
439
  const name = Expression.identifier(type.name);
@@ -461,7 +460,7 @@ export class BaseDriver {
461
460
  continue;
462
461
  }
463
462
  set.push(BinaryExpression.create({
464
- left: Expression.identifier(key.columnName),
463
+ left: key.quotedColumnNameExp,
465
464
  operator: "=",
466
465
  right: Constant.create({ value: change.newValue ?? null })
467
466
  }));
@@ -469,7 +468,7 @@ export class BaseDriver {
469
468
  let where = null;
470
469
  for (const iterator of entry.type.keys) {
471
470
  const compare = BinaryExpression.create({
472
- left: Expression.identifier(iterator.columnName),
471
+ left: iterator.quotedColumnNameExp,
473
472
  operator: "=",
474
473
  right: Constant.create({ value: entry.entity[iterator.name] })
475
474
  });
@@ -495,7 +494,7 @@ export class BaseDriver {
495
494
  return null;
496
495
  }
497
496
  const compare = BinaryExpression.create({
498
- left: Expression.identifier(iterator.columnName),
497
+ left: iterator.quotedColumnNameExp,
499
498
  operator: "=",
500
499
  right: Constant.create({ value: key })
501
500
  });
package/dist/drivers/base/BaseDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"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"}
package/dist/entity-query/EntityType.js CHANGED
@@ -96,7 +96,7 @@ export default class EntityType {
96
96
  return this.fieldMap.get(name);
97
97
  }
98
98
  getFieldMap(p) {
99
- return this.columns.map((x) => Expression.as(Expression.member(p, x.columnName), Expression.quotedIdentifier(x.name)));
99
+ return this.columns.map((x) => Expression.as(Expression.member(p, x.quotedColumnNameExp), Expression.quotedIdentifier(x.name)));
100
100
  }
101
101
  addRelation(relation, getInverseModel) {
102
102
  // we will also set fk to the corresponding column
@@ -180,7 +180,7 @@ export default class EntityType {
180
180
  const source = this.fullyQualifiedName;
181
181
  as ??= Expression.parameter(this.name[0] + "1", this);
182
182
  as.model = this;
183
- const fields = this.columns.map((c) => Expression.member(as, c.columnName));
183
+ const fields = this.columns.map((c) => Expression.member(as, c.quotedColumnNameExp));
184
184
  this.selectAll = SelectStatement.create({
185
185
  source,
186
186
  model: this,
package/dist/entity-query/EntityType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}
package/dist/migrations/postgres/PostgresAutomaticMigrations.js CHANGED
@@ -164,7 +164,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
164
164
  const env_1 = { stack: [], error: void 0, hasError: false };
165
165
  try {
166
166
  const tx = __addDisposableResource(env_1, await driver.createTransaction(), true);
167
- if (prepare && !constraint.doNotClearExisting) {
167
+ if (constraint.clearExisting && prepare) {
168
168
  await driver.executeQuery(prepare);
169
169
  }
170
170
  await driver.executeQuery(text);
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
@@ -25,11 +25,11 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
25
25
  async createIndexes(context, type, fkColumns) {
26
26
  for (const iterator of fkColumns) {
27
27
  const filter = iterator.nullable
28
- ? `${iterator.columnName} IS NOT NULL`
28
+ ? `${iterator.quotedColumnName} IS NOT NULL`
29
29
  : "";
30
30
  const indexDef = {
31
31
  name: `IX_${type.name}_${iterator.name}`,
32
- columns: [{ name: iterator.columnName, descending: iterator.indexOrder !== "ascending" }],
32
+ columns: [{ name: iterator.quotedColumnName, descending: iterator.indexOrder !== "ascending" }],
33
33
  filter
34
34
  };
35
35
  await this.migrateIndex(context, indexDef, type);
@@ -43,7 +43,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
43
43
  nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
44
44
  }
45
45
  for (const iterator of nonKeyColumns) {
46
- const columnName = iterator.columnName;
46
+ const columnName = iterator.quotedColumnName;
47
47
  let def = `IF COL_LENGTH(${SqlServerLiteral.escapeLiteral(name)}, ${SqlServerLiteral.escapeLiteral(columnName)}) IS NULL ALTER TABLE ${name} ADD ${columnName} `;
48
48
  if (iterator.computed) {
49
49
  def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
@@ -75,7 +75,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
75
75
  }
76
76
  const fields = [];
77
77
  for (const iterator of keys) {
78
- let def = iterator.columnName + " ";
78
+ let def = iterator.quotedColumnName + " ";
79
79
  if (iterator.generated) {
80
80
  switch (iterator.generated) {
81
81
  case "identity":
@@ -91,7 +91,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
91
91
  }
92
92
  await driver.executeQuery(`IF OBJECT_ID(${SqlServerLiteral.escapeLiteral(name)}) IS NULL BEGIN
93
93
  CREATE TABLE ${name} (${fields.join(",")}
94
- , CONSTRAINT PK_${name} PRIMARY KEY(${keys.map((x) => x.columnName)})
94
+ , CONSTRAINT PK_${name} PRIMARY KEY(${keys.map((x) => x.quotedColumnName)})
95
95
  );
96
96
  END`);
97
97
  }
@@ -141,9 +141,9 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
141
141
  }
142
142
  const driver = context.connection;
143
143
  let text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name}
144
- foreign key (${constraint.fkMap.map((x) => x.fkColumn.columnName).join(",")})
144
+ foreign key (${constraint.fkMap.map((x) => x.fkColumn.quotedColumnName).join(",")})
145
145
  references ${constraint.fkMap[0].relatedKeyColumn.entityType.name}(
146
- ${constraint.fkMap.map((x) => x.relatedKeyColumn.columnName).join(",")}
146
+ ${constraint.fkMap.map((x) => x.relatedKeyColumn.quotedColumnName).join(",")}
147
147
  ) `;
148
148
  switch (constraint.onDelete) {
149
149
  case "cascade":
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/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;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,UAAU,MAAM,+BAA+B,CAAC;AA8CvD,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,GAcR,YAAY,CAAC,CAAC,CAAC;IAGpC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU;CAIlD"}
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;AAiDvD,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,GAcR,YAAY,CAAC,CAAC,CAAC;IAGpC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU;CAIlD"}
package/dist/model/EntityModel.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import SchemaRegistry from "../decorators/SchemaRegistry.js";
2
2
  import { EntitySource } from "./EntitySource.js";
3
3
  import EntityType from "../entity-query/EntityType.js";
4
+ import { Expression } from "../query/ast/Expressions.js";
4
5
  const driverModelCache = Symbol("driverModelCache");
5
6
  const getOrCreateModel = (map, type, compiler) => {
6
7
  let t = map.get(type);
@@ -20,6 +21,8 @@ const getOrCreateModel = (map, type, compiler) => {
20
21
  column.entityType = t;
21
22
  column.quotedColumnName = quote(column.columnName);
22
23
  column.quotedName = quote(column.name);
24
+ column.quotedColumnNameExp = Expression.quotedIdentifier(column.columnName);
25
+ column.quotedNameExp = Expression.quotedIdentifier(column.name);
23
26
  t.addColumn(column);
24
27
  }
25
28
  t.indexes.push(...original.indexes.map((i) => ({ ...i, columns: [...i.columns.map((c) => ({ ...c }))] })));
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;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAKvD,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAEpD,MAAM,gBAAgB,GAAG,CAAC,GAAyB,EAAE,IAAmB,EAAE,QAAuB,EAAE,EAAE;IACjG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC;QACJ,OAAO,CAAC,CAAC;IACb,CAAC;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IAC7C,CAAC,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACtD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAG,CAAC,CAAC,CAAC;IAClB,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,EAAE,GAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,YAAY;YACnC,CAAC,CAAC,MAAM,CAAC,UAAU;YACnB,CAAC,CAAC,CAAC,gBAAgB;gBACX,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;QACtB,MAAM,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IACD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAI,CAAC,EAAE,OAAO,EAAE,CAAE,GAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,EAAE,GAAI,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChH,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAI,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAI,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,eAAe;IACf,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAC7B,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC,uBAAuB,EAAE,CAAC;QACnE,CAAC;QACD,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YAC7B,SAAS;QACb,CAAC;QACD,MAAM,QAAQ,GAAoB,EAAE,GAAI,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAClF,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW;IAMR;IAJb,OAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;IAEtD,KAAK,GAAmC,IAAI,GAAG,EAAE,CAAC;IAEzD,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAC1C,CAAC;IAED,QAAQ,CAAI,IAAiB;QACzB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;YACpE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YACzC,MAAM,UAAU,GAAG,gBAAgB,CAC/B,KAAK,EACL,IAAI,EACJ,QAAQ,CACX,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,MAAM,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,MAAyB,CAAC;IACrC,CAAC;IAED,aAAa,CAAI,IAAiB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CAEJ"}
1
+ {"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAIvD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAEpD,MAAM,gBAAgB,GAAG,CAAC,GAAyB,EAAE,IAAmB,EAAE,QAAuB,EAAE,EAAE;IACjG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC;QACJ,OAAO,CAAC,CAAC;IACb,CAAC;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IAC7C,CAAC,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACtD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAG,CAAC,CAAC,CAAC;IAClB,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,EAAE,GAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,YAAY;YACnC,CAAC,CAAC,MAAM,CAAC,UAAU;YACnB,CAAC,CAAC,CAAC,gBAAgB;gBACX,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;QACtB,MAAM,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,mBAAmB,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5E,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IACD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAI,CAAC,EAAE,OAAO,EAAE,CAAE,GAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,EAAE,GAAI,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChH,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAI,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAI,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,eAAe;IACf,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAC7B,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC,uBAAuB,EAAE,CAAC;QACnE,CAAC;QACD,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YAC7B,SAAS;QACb,CAAC;QACD,MAAM,QAAQ,GAAoB,EAAE,GAAI,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAClF,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW;IAMR;IAJb,OAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;IAEtD,KAAK,GAAmC,IAAI,GAAG,EAAE,CAAC;IAEzD,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAC1C,CAAC;IAED,QAAQ,CAAI,IAAiB;QACzB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;YACpE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YACzC,MAAM,UAAU,GAAG,gBAAgB,CAC/B,KAAK,EACL,IAAI,EACJ,QAAQ,CACX,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,MAAM,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,MAAyB,CAAC;IACrC,CAAC;IAED,aAAa,CAAI,IAAiB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CAEJ"}
package/dist/model/EntityQuery.js CHANGED
@@ -66,8 +66,8 @@ export default class EntityQuery {
66
66
  const propertyName = iterator.alias.value;
67
67
  const column = type.getField(propertyName);
68
68
  if (column) {
69
- fields.push(Expression.member(selectStatement.sourceParameter, Expression.quotedIdentifier(column.columnName)));
70
- modelFields.push(Expression.member(sourceParameter, Expression.quotedIdentifier(column.columnName)));
69
+ fields.push(Expression.member(selectStatement.sourceParameter, column.quotedColumnNameExp));
70
+ modelFields.push(Expression.member(sourceParameter, column.quotedColumnNameExp));
71
71
  continue;
72
72
  }
73
73
  const { expression } = iterator;
@@ -258,7 +258,7 @@ export default class EntityQuery {
258
258
  const as = Expression.parameter("s1", this.type);
259
259
  let where;
260
260
  for (const iterator of this.type.keys) {
261
- const compare = Expression.equal(Expression.member(sp, Expression.quotedIdentifier(iterator.columnName)), Expression.member(as, Expression.quotedIdentifier(iterator.columnName)));
261
+ const compare = Expression.equal(Expression.member(sp, iterator.quotedColumnNameExp), Expression.member(as, iterator.quotedColumnNameExp));
262
262
  where = where ? Expression.logicalAnd(where, compare) : compare;
263
263
  }
264
264
  const join = JoinExpression.create({
@@ -383,22 +383,22 @@ export default class EntityQuery {
383
383
  const eAs = iterator;
384
384
  const { field } = this.type.getProperty(eAs.alias.value);
385
385
  fieldMap.add(field.columnName);
386
- set.push(Expression.assign(Expression.quotedIdentifier(field.columnName), Expression.member(as, Expression.quotedIdentifier(eAs.alias.value))));
386
+ set.push(Expression.assign(field.quotedColumnNameExp, Expression.member(as, Expression.quotedIdentifier(eAs.alias.value))));
387
387
  }
388
388
  let where = null;
389
389
  for (const iterator of this.type.keys) {
390
- const compare = Expression.equal(Expression.member(as, Expression.quotedIdentifier(iterator.columnName)), Expression.member(sp, Expression.quotedIdentifier(iterator.columnName)));
390
+ const compare = Expression.equal(Expression.member(as, iterator.quotedColumnNameExp), Expression.member(sp, iterator.quotedColumnNameExp));
391
391
  where = where ? Expression.logicalAnd(where, compare) : compare;
392
392
  if (fieldMap.has(iterator.columnName)) {
393
393
  continue;
394
394
  }
395
- this.selectStatement.fields.push(Expression.member(this.selectStatement.sourceParameter, Expression.quotedIdentifier(iterator.columnName)));
395
+ this.selectStatement.fields.push(Expression.member(this.selectStatement.sourceParameter, iterator.quotedColumnNameExp));
396
396
  }
397
397
  let returnUpdated = null;
398
398
  if (returnEntity) {
399
399
  returnUpdated = [];
400
400
  for (const iterator of this.type.columns) {
401
- returnUpdated.push(Expression.as(Expression.identifier(iterator.columnName), Expression.quotedIdentifier(iterator.name)));
401
+ returnUpdated.push(Expression.as(iterator.quotedColumnNameExp, iterator.quotedNameExp));
402
402
  }
403
403
  }
404
404
  const updateStatement = UpdateStatement.create({
@@ -457,7 +457,7 @@ export default class EntityQuery {
457
457
  const me = iterator;
458
458
  const column = type.getColumn(me.property.value);
459
459
  if (column) {
460
- fields.push(Expression.as(Expression.member(select.sourceParameter, column.columnName), Expression.quotedIdentifier(column.name)));
460
+ fields.push(Expression.as(Expression.member(select.sourceParameter, column.quotedColumnNameExp), Expression.quotedIdentifier(column.name)));
461
461
  continue;
462
462
  }
463
463
  }