@entity-access/entity-access 1.0.201 → 1.0.203
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.
- package/dist/common/ObjectPool.d.ts +1 -1
- package/dist/common/ObjectPool.d.ts.map +1 -1
- package/dist/common/ObjectPool.js +1 -1
- package/dist/common/ObjectPool.js.map +1 -1
- package/dist/compiler/QueryCompiler.d.ts +2 -1
- package/dist/compiler/QueryCompiler.d.ts.map +1 -1
- package/dist/compiler/QueryCompiler.js +2 -3
- package/dist/compiler/QueryCompiler.js.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts.map +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.js +2 -3
- package/dist/drivers/sql-server/SqlServerQueryCompiler.js.map +1 -1
- package/dist/entity-query/EntityType.d.ts +4 -3
- package/dist/entity-query/EntityType.d.ts.map +1 -1
- package/dist/entity-query/EntityType.js +14 -9
- package/dist/entity-query/EntityType.js.map +1 -1
- package/dist/model/EntityModel.d.ts.map +1 -1
- package/dist/model/EntityModel.js +4 -1
- package/dist/model/EntityModel.js.map +1 -1
- package/dist/model/EntityQuery.d.ts.map +1 -1
- package/dist/model/EntityQuery.js +13 -4
- package/dist/model/EntityQuery.js.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +12 -6
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/query/ast/Expressions.d.ts +2 -0
- package/dist/query/ast/Expressions.d.ts.map +1 -1
- package/dist/query/ast/Expressions.js +3 -0
- package/dist/query/ast/Expressions.js.map +1 -1
- package/dist/tests/db-tests/tests/select-map.d.ts +3 -0
- package/dist/tests/db-tests/tests/select-map.d.ts.map +1 -0
- package/dist/tests/db-tests/tests/select-map.js +12 -0
- package/dist/tests/db-tests/tests/select-map.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/ObjectPool.ts +1 -1
- package/src/compiler/QueryCompiler.ts +3 -2
- package/src/drivers/postgres/PostgreSqlDriver.ts +1 -1
- package/src/drivers/sql-server/SqlServerQueryCompiler.ts +2 -1
- package/src/entity-query/EntityType.ts +17 -10
- package/src/model/EntityModel.ts +9 -2
- package/src/model/EntityQuery.ts +14 -4
- package/src/query/ast/ExpressionToSql.ts +12 -6
- package/src/query/ast/Expressions.ts +5 -0
- package/src/tests/db-tests/tests/select-map.ts +19 -0
|
@@ -39,7 +39,7 @@ export default class ObjectPool<T> {
|
|
|
39
39
|
private total;
|
|
40
40
|
private awaited;
|
|
41
41
|
private logger;
|
|
42
|
-
constructor({
|
|
42
|
+
constructor({ maxWait, poolSize, maxSize, logger, asyncFactory, factory, destroy, subscribeForRemoval }: IObjectPool<T>);
|
|
43
43
|
dispose(): Promise<void>;
|
|
44
44
|
acquire(): Promise<IPooledObject<T>>;
|
|
45
45
|
private setupItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectPool.d.ts","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAE1B,UAAU,WAAW,CAAC,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC;IAE1B,mBAAmB,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAEvE;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG;IAC/B,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC;IAE7B,IAAW,QAAQ,WAElB;IAGD,IAAW,WAAW,WAErB;IAED,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,OAAO,CAAmB;IAElC,OAAO,CAAC,mBAAmB,CAAqD;IAEhF,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,IAAI,CAAW;IAEvB,OAAO,CAAC,KAAK,CAAa;IAE1B,OAAO,CAAC,OAAO,CAAmC;IAElD,OAAO,CAAC,MAAM,CAAyB;gBAE3B,EACR,
|
|
1
|
+
{"version":3,"file":"ObjectPool.d.ts","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAE1B,UAAU,WAAW,CAAC,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC;IAE1B,mBAAmB,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAEvE;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG;IAC/B,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC;IAE7B,IAAW,QAAQ,WAElB;IAGD,IAAW,WAAW,WAErB;IAED,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,OAAO,CAAmB;IAElC,OAAO,CAAC,mBAAmB,CAAqD;IAEhF,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,IAAI,CAAW;IAEvB,OAAO,CAAC,KAAK,CAAa;IAE1B,OAAO,CAAC,OAAO,CAAmC;IAElD,OAAO,CAAC,MAAM,CAAyB;gBAE3B,EACR,OAAc,EACd,QAAa,EACb,OAAsB,EACtB,MAAM,EACN,YAAY,EACZ,OAAO,EACP,OAAO,EACP,mBAAmB,EACtB,EAAE,WAAW,CAAC,CAAC,CAAC;IAWJ,OAAO;IAYP,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IA+BjD,OAAO,CAAC,SAAS;CAsBpB;AAED,qBAAa,eAAe,CAAC,CAAC;IAId,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,UAAU,CAAyD;gBAEvD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC;IAIrD,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;CAKxD"}
|
|
@@ -15,7 +15,7 @@ export default class ObjectPool {
|
|
|
15
15
|
get currentSize() {
|
|
16
16
|
return this.total;
|
|
17
17
|
}
|
|
18
|
-
constructor({
|
|
18
|
+
constructor({ maxWait = 5000, poolSize = 20, maxSize = poolSize * 2, logger, asyncFactory, factory, destroy, subscribeForRemoval }) {
|
|
19
19
|
this.free = [];
|
|
20
20
|
this.total = 0;
|
|
21
21
|
this.awaited = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectPool.js","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,mDAAmD;AACnD,OAAO,kBAAkB,CAAC;AAgC1B;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC5B,CAAC;IAGD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAwBD,YAAY,EACR,OAAO,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"ObjectPool.js","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,11 @@ export default class QueryCompiler {
|
|
|
14
14
|
static instance: QueryCompiler;
|
|
15
15
|
readonly arrowToExpression: typeof ArrowToExpression;
|
|
16
16
|
readonly expressionToSql: typeof ExpressionToSql;
|
|
17
|
+
readonly quote: IStringTransformer;
|
|
17
18
|
readonly namingConvention: IStringTransformer;
|
|
18
19
|
readonly escapeLiteral: IStringTransformer;
|
|
19
20
|
readonly sqlMethodTransformer: ISqlMethodTransformer;
|
|
20
|
-
constructor({ arrowToExpression, expressionToSql, namingConvention, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
21
|
+
constructor({ arrowToExpression, expressionToSql, namingConvention, quote, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
21
22
|
execute<P = any, T = any>(parameters: P, fx: (p: P) => (x: T) => any, source?: EntityQuery): {
|
|
22
23
|
text: string;
|
|
23
24
|
values: any[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAmB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAErE,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAElD,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,qBAAa,aAAa;IAEX,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,UAAU;gBAFrB,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,UAAU;CACnC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,OAAc,QAAQ,gBAAuB;IAE7C,SAAgB,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5D,SAAgB,eAAe,EAAE,OAAO,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAmB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAErE,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAElD,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,qBAAa,aAAa;IAEX,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,UAAU;gBAFrB,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,UAAU;CACnC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,OAAc,QAAQ,gBAAuB;IAE7C,SAAgB,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5D,SAAgB,eAAe,EAAE,OAAO,eAAe,CAAC;IAExD,SAAgB,KAAK,EAAE,kBAAkB,CAAC;IAC1C,SAAgB,gBAAgB,EAAE,kBAAkB,CAAC;IACrD,SAAgB,aAAa,EAAE,kBAAkB,CAAC;IAElD,SAAgB,oBAAoB,EAAE,qBAAqB,CAAC;gBAGxD,EACI,iBAAqC,EACrC,eAAiC,EACjC,gBAA8C,EAC9C,KAAsB,EACtB,aAAwC,EACxC,oBAAkD,EACrD,GAAE,OAAO,CAAC,aAAa,CAAM;IAW3B,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,EAAE,MAAM,CAAC,EAAE,WAAW;;;;IAO1F,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,KAAA,KAAK,CAAC,CAAC,KAAA,KAAK,GAAG;;;;;IAKlD,YAAY,CAAE,MAAM,EAAE,WAAW,EAAG,EAAE,EAAE,CAAC,CAAC,KAAA,KAAK,CAAC,CAAC,KAAA,KAAK,GAAG;IAOzD,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU;;;;IAMtD,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,mBAAmB;IAMtF,OAAO,CAAC,MAAM;CA0BjB"}
|
|
@@ -12,14 +12,13 @@ export class CompiledQuery {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
class QueryCompiler {
|
|
15
|
-
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSql, namingConvention = NamingConventions.snakeCase,
|
|
16
|
-
// quotedLiteral = JSON.stringify,
|
|
17
|
-
escapeLiteral = SqlLiteral.escapeLiteral, sqlMethodTransformer = PostgreSqlMethodTransformer } = {}) {
|
|
15
|
+
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSql, namingConvention = NamingConventions.snakeCase, quote = JSON.stringify, escapeLiteral = SqlLiteral.escapeLiteral, sqlMethodTransformer = PostgreSqlMethodTransformer } = {}) {
|
|
18
16
|
this.arrowToExpression = arrowToExpression;
|
|
19
17
|
this.expressionToSql = expressionToSql;
|
|
20
18
|
this.escapeLiteral = escapeLiteral;
|
|
21
19
|
this.namingConvention = namingConvention;
|
|
22
20
|
// this.quotedLiteral = quotedLiteral;
|
|
21
|
+
this.quote = quote;
|
|
23
22
|
this.sqlMethodTransformer = sqlMethodTransformer;
|
|
24
23
|
}
|
|
25
24
|
execute(parameters, fx, source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCompiler.js","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAG9D,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,2BAA2B,MAAM,2CAA2C,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,MAAM,OAAO,aAAa;IACtB,YACW,IAAyB,EACzB,MAA2B,EAC3B,SAAqB;QAFrB,SAAI,GAAJ,IAAI,CAAqB;QACzB,WAAM,GAAN,MAAM,CAAqB;QAC3B,cAAS,GAAT,SAAS,CAAY;IAAG,CAAC;CACvC;AAED,MAAqB,aAAa;IAa9B,YACI,EACI,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,eAAe,EACjC,gBAAgB,GAAG,iBAAiB,CAAC,SAAS
|
|
1
|
+
{"version":3,"file":"QueryCompiler.js","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAG9D,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,2BAA2B,MAAM,2CAA2C,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,MAAM,OAAO,aAAa;IACtB,YACW,IAAyB,EACzB,MAA2B,EAC3B,SAAqB;QAFrB,SAAI,GAAJ,IAAI,CAAqB;QACzB,WAAM,GAAN,MAAM,CAAqB;QAC3B,cAAS,GAAT,SAAS,CAAY;IAAG,CAAC;CACvC;AAED,MAAqB,aAAa;IAa9B,YACI,EACI,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,eAAe,EACjC,gBAAgB,GAAG,iBAAiB,CAAC,SAAS,EAC9C,KAAK,GAAG,IAAI,CAAC,SAAS,EACtB,aAAa,GAAG,UAAU,CAAC,aAAa,EACxC,oBAAoB,GAAG,2BAA2B,KAC1B,EAAE;QAE9B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,sCAAsC;QACtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAEM,OAAO,CAAmB,UAAa,EAAE,EAA2B,EAAE,MAAoB;QAC7F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAEM,OAAO,CAAC,MAAmB,EAAE,EAAqB;QACrD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IAEM,YAAY,CAAE,MAAmB,EAAG,EAAqB;QAC5D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,EAAC,GAAG,CAAC,MAAM,EAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAEM,iBAAiB,CAAC,MAAmB,EAAE,GAAe;QACzD,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,IAAI,EAAE,IAAI,EAAG,GAAuB,EAAE,eAAe,IAAI,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAC1J,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,iBAAiB,CAAC,MAAmB,EAAE,GAAe,EAAE,EAAuB;QAClF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEO,MAAM,CAAC,KAAiB,EAAE,IAAS,EAAE;QACzC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;YAC1B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAChC,IAAI,IAAI,QAAQ,CAAC;gBACjB,SAAS;aACZ;YACD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACtB,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE;oBACpB,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;wBAC1B,IAAI,IAAI,EAAE,CAAC;wBACX,SAAS;qBACZ;oBACD,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;oBAClB,IAAI,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;iBAC/B;gBACD,SAAS;aACZ;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,IAAI,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;SAC/B;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;;AArFa,sBAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;eAF5B,aAAa"}
|
|
@@ -59,7 +59,7 @@ export default class PostgreSqlDriver extends BaseDriver {
|
|
|
59
59
|
config.poolSize ??= 20;
|
|
60
60
|
this.pool = new ObjectPool({
|
|
61
61
|
poolSize: config.poolSize,
|
|
62
|
-
maxSize: (config.poolSize) *
|
|
62
|
+
maxSize: (config.poolSize) * 10,
|
|
63
63
|
asyncFactory: async () => {
|
|
64
64
|
const c = new pg.Client(this.config);
|
|
65
65
|
await c.connect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSqlDriver.js","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,UAA6B,MAAM,4BAA4B,CAAC;AACvE,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAE5D,OAAO,2BAA2B,MAAM,0DAA0D,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB,EAAqE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAClK,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,MAAM,MAAM,WAAW,CAAC;AAgB9B,CAAC;AAEF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAE5B,MAAM,QAAQ;IAKV,YACY,OAAe,EACf,UAAgC,EAChC,MAAoB;QAFpB,YAAO,GAAP,OAAO,CAAQ;QACf,eAAU,GAAV,UAAU,CAAsB;QAChC,WAAM,GAAN,MAAM,CAAc;IAEhC,CAAC;IAED,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG;QAEjB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE;YAClC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;SAC5B;QACD,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,GAAG;YACC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,KAAM,CAAC,CAAA,IAAI,CAAC;YACZ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnB,MAAM;aACT;SACJ,QAAQ,IAAI,EAAE;IACnB,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI;YACA,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SAC7B;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;SACvC;QAED,IAAI;YACA,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;aAC5C;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;SACvC;IACL,CAAC;IAED,CAAC,MAAM,CAAC,YAAY,CAAC;QACjB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU;IAEpD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAMD,YAA6B,MAA8B;QACvD,KAAK,CAAC,MAAM,CAAC,CAAC;QADW,WAAM,GAAN,MAAM,CAAwB;QAJnD,eAAU,GAAG,IAAI,aAAa,EAAE,CAAC;QAMrC,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,UAAU,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"PostgreSqlDriver.js","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import QueryCompiler from "../../compiler/QueryCompiler.js";
|
|
2
2
|
export default class SqlServerQueryCompiler extends QueryCompiler {
|
|
3
|
-
constructor({ arrowToExpression, expressionToSql, namingConvention, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
3
|
+
constructor({ arrowToExpression, expressionToSql, quote, namingConvention, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
4
4
|
}
|
|
5
5
|
//# sourceMappingURL=SqlServerQueryCompiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerQueryCompiler.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAM5D,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;gBAEjD,EACR,iBAAqC,EACrC,eAAuC,
|
|
1
|
+
{"version":3,"file":"SqlServerQueryCompiler.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAM5D,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;gBAEjD,EACR,iBAAqC,EACrC,eAAuC,EACvC,KAAsC,EACtC,gBAA+C,EAC/C,aAA8C,EAC9C,oBAAoD,EACvD,GAAE,OAAO,CAAC,aAAa,CAAM;CAYjC"}
|
|
@@ -5,13 +5,12 @@ import ArrowToExpression from "../../query/parser/ArrowToExpression.js";
|
|
|
5
5
|
import ExpressionToSqlServer from "./ExpressionToSqlServer.js";
|
|
6
6
|
import { SqlServerLiteral } from "./SqlServerLiteral.js";
|
|
7
7
|
export default class SqlServerQueryCompiler extends QueryCompiler {
|
|
8
|
-
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSqlServer,
|
|
9
|
-
// quotedLiteral = SqlServerLiteral.quotedLiteral,
|
|
10
|
-
namingConvention = NamingConventions.pascalCase, escapeLiteral = SqlServerLiteral.escapeLiteral, sqlMethodTransformer = SqlServerSqlMethodTransformer } = {}) {
|
|
8
|
+
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSqlServer, quote = SqlServerLiteral.quotedLiteral, namingConvention = NamingConventions.pascalCase, escapeLiteral = SqlServerLiteral.escapeLiteral, sqlMethodTransformer = SqlServerSqlMethodTransformer } = {}) {
|
|
11
9
|
super({
|
|
12
10
|
arrowToExpression,
|
|
13
11
|
expressionToSql,
|
|
14
12
|
namingConvention,
|
|
13
|
+
quote,
|
|
15
14
|
// quotedLiteral,
|
|
16
15
|
escapeLiteral,
|
|
17
16
|
sqlMethodTransformer
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerQueryCompiler.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,6BAA6B,MAAM,4DAA4D,CAAC;AACvG,OAAO,iBAAiB,MAAM,yCAAyC,CAAC;AACxE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;IAE7D,YAAY,EACR,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,qBAAqB
|
|
1
|
+
{"version":3,"file":"SqlServerQueryCompiler.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,6BAA6B,MAAM,4DAA4D,CAAC;AACvG,OAAO,iBAAiB,MAAM,yCAAyC,CAAC;AACxE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;IAE7D,YAAY,EACR,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,qBAAqB,EACvC,KAAK,GAAG,gBAAgB,CAAC,aAAa,EACtC,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,EAC/C,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAC9C,oBAAoB,GAAG,6BAA6B,KAC5B,EAAE;QAC1B,KAAK,CAAC;YACF,iBAAiB;YACjB,eAAe;YACf,gBAAgB;YAChB,KAAK;YACL,iBAAiB;YACjB,aAAa;YACb,oBAAoB;SACvB,CAAC,CAAC;IACP,CAAC;CAEJ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IColumn, IEntityRelation } from "../decorators/IColumn.js";
|
|
2
2
|
import { IClassOf } from "../decorators/IClassOf.js";
|
|
3
|
-
import { Expression, ExpressionAs, TableLiteral } from "../query/ast/Expressions.js";
|
|
3
|
+
import { Expression, ExpressionAs, ParameterExpression, TableLiteral } from "../query/ast/Expressions.js";
|
|
4
4
|
import { IIndex } from "../decorators/IIndex.js";
|
|
5
5
|
import { IStringTransformer } from "../query/ast/IStringTransformer.js";
|
|
6
6
|
export declare const addOrCreateColumnSymbol: unique symbol;
|
|
@@ -35,12 +35,13 @@ export default class EntityType {
|
|
|
35
35
|
addColumn(c: IColumn): void;
|
|
36
36
|
getColumn(name: string): IColumn;
|
|
37
37
|
getField(name: string): IColumn;
|
|
38
|
+
getFieldMap(p: ParameterExpression): ExpressionAs[];
|
|
38
39
|
addRelation(relation: IEntityRelation, getInverseModel?: (t: any) => EntityType): IEntityRelation;
|
|
39
40
|
selectAllFields(): {
|
|
40
41
|
type: "SelectStatement";
|
|
41
42
|
preferLeftJoins: boolean;
|
|
42
43
|
source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
|
|
43
|
-
sourceParameter:
|
|
44
|
+
sourceParameter: ParameterExpression;
|
|
44
45
|
fields: (Expression | ExpressionAs | import("../query/ast/Expressions.js").Identifier)[];
|
|
45
46
|
where: Expression;
|
|
46
47
|
orderBy: import("../query/ast/Expressions.js").OrderByExpression[];
|
|
@@ -53,7 +54,7 @@ export default class EntityType {
|
|
|
53
54
|
type: "SelectStatement";
|
|
54
55
|
preferLeftJoins: boolean;
|
|
55
56
|
source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
|
|
56
|
-
sourceParameter:
|
|
57
|
+
sourceParameter: ParameterExpression;
|
|
57
58
|
fields: (Expression | ExpressionAs | import("../query/ast/Expressions.js").Identifier)[];
|
|
58
59
|
where: Expression;
|
|
59
60
|
orderBy: import("../query/ast/Expressions.js").OrderByExpression[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAiB,mBAAmB,EAAmB,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE1I,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AACnE,eAAO,MAAM,eAAe,eAA8B,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAGD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,SAAgB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,SAAgB,UAAU,EAAE,MAAM,CAAC;IAGnC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvC,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,oEAO5B;IAED,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAkB;gBAEvB,QAAQ,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,kBAAkB;IAWxE,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAM1C,SAAS,CAAC,CAAC,EAAE,OAAO;IAkBpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,WAAW,CAAC,CAAC,EAAE,mBAAmB;IAKzC,WAAW,CAAC,QAAQ,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,KAAA,KAAK,UAAU;IA0DnE,eAAe;;;;;;;;;;;;;IAiBf,eAAe;;;;;;;;;;;;;IAmBf,GAAG,CAAC,GAAG,EAAE,GAAG;CAatB"}
|
|
@@ -63,6 +63,9 @@ export default class EntityType {
|
|
|
63
63
|
getField(name) {
|
|
64
64
|
return this.fieldMap.get(name);
|
|
65
65
|
}
|
|
66
|
+
getFieldMap(p) {
|
|
67
|
+
return this.columns.map((x) => Expression.as(Expression.member(p, x.columnName), Expression.quotedIdentifier(x.name)));
|
|
68
|
+
}
|
|
66
69
|
addRelation(relation, getInverseModel) {
|
|
67
70
|
// we will also set fk to the corresponding column
|
|
68
71
|
this.relations.push(relation);
|
|
@@ -150,15 +153,17 @@ export default class EntityType {
|
|
|
150
153
|
return { ...this.selectOne };
|
|
151
154
|
}
|
|
152
155
|
map(row) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
}
|
|
161
|
-
|
|
156
|
+
Object.setPrototypeOf(row, this.typeClass.prototype);
|
|
157
|
+
return row;
|
|
158
|
+
// const c = new this.typeClass();
|
|
159
|
+
// for (const iterator of this.columns) {
|
|
160
|
+
// const value = row[iterator.columnName];
|
|
161
|
+
// if (value === void 0) {
|
|
162
|
+
// continue;
|
|
163
|
+
// }
|
|
164
|
+
// c[iterator.name] = value;
|
|
165
|
+
// }
|
|
166
|
+
// return c;
|
|
162
167
|
}
|
|
163
168
|
}
|
|
164
169
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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;AAyCvD,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;IAgB7B,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU;CAIlD"}
|
|
@@ -12,7 +12,10 @@ const getOrCreateModel = (map, type, namingConvention) => {
|
|
|
12
12
|
map.set(type, t);
|
|
13
13
|
for (const iterator of original.columns) {
|
|
14
14
|
const column = { ...iterator };
|
|
15
|
-
column.columnName = column.explicitName
|
|
15
|
+
column.columnName = column.explicitName
|
|
16
|
+
? column.columnName
|
|
17
|
+
: (namingConvention
|
|
18
|
+
? namingConvention(column.columnName) : column.columnName);
|
|
16
19
|
t.addColumn(column);
|
|
17
20
|
column.entityType = t;
|
|
18
21
|
}
|
|
@@ -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;AAIvD,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAEpD,MAAM,gBAAgB,GAAG,CAAC,GAAyB,EAAE,IAAmB,EAAE,gBAAoC,EAAE,EAAE;IAC9G,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,CAAC,EAAE;QACH,OAAO,CAAC,CAAC;KACZ;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAC/C,GAAG,CAAC,GAAG,CAAC,IAAI,EAAG,CAAC,CAAC,CAAC;IAClB,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE;QACrC,MAAM,MAAM,GAAG,EAAE,GAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AACA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAIzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA+G,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG3K,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;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,GAAG,EAAE,CAAC;gBACV,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;
|
|
1
|
+
{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AACA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAIzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAA+G,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG3K,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;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,GAAG,EAAE,CAAC;gBACV,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAwBlC,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;IAkD7C,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW;IAuBlG,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,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,GAAG;IAI9C,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIrB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIhB,GAAG,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC/C,KAAK,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAuCvD,OAAO,CAAC,MAAM;CAMjB"}
|
|
@@ -14,7 +14,7 @@ export default class EntityQuery {
|
|
|
14
14
|
return this.map(p, fx);
|
|
15
15
|
}
|
|
16
16
|
map(parameters, fx) {
|
|
17
|
-
|
|
17
|
+
const q = this.extend(parameters, fx, (select, body) => {
|
|
18
18
|
const fields = [];
|
|
19
19
|
switch (body.type) {
|
|
20
20
|
case "NewObjectExpression":
|
|
@@ -22,7 +22,7 @@ export default class EntityQuery {
|
|
|
22
22
|
for (const iterator of noe.properties) {
|
|
23
23
|
fields.push(ExpressionAs.create({
|
|
24
24
|
expression: iterator.expression,
|
|
25
|
-
alias: iterator.alias
|
|
25
|
+
alias: Expression.quotedIdentifier(iterator.alias.value)
|
|
26
26
|
}));
|
|
27
27
|
}
|
|
28
28
|
break;
|
|
@@ -32,6 +32,8 @@ export default class EntityQuery {
|
|
|
32
32
|
}
|
|
33
33
|
return { ...select, fields };
|
|
34
34
|
});
|
|
35
|
+
q.type = null;
|
|
36
|
+
return q;
|
|
35
37
|
}
|
|
36
38
|
withSignal(signal) {
|
|
37
39
|
return new EntityQuery({ ...this, signal });
|
|
@@ -82,13 +84,17 @@ export default class EntityQuery {
|
|
|
82
84
|
await Promise.all(loaders);
|
|
83
85
|
}
|
|
84
86
|
signal?.throwIfAborted();
|
|
85
|
-
|
|
87
|
+
let select = this.selectStatement;
|
|
88
|
+
if (type && select.model) {
|
|
89
|
+
select = { ...select, fields: select.model.getFieldMap(select.sourceParameter) };
|
|
90
|
+
}
|
|
91
|
+
query = this.context.driver.compiler.compileExpression(this, select);
|
|
86
92
|
this.traceQuery?.(query.text);
|
|
87
93
|
const reader = await this.context.connection.executeReader(query, signal);
|
|
88
94
|
scope.register(reader);
|
|
89
95
|
for await (const iterator of reader.next(10, signal)) {
|
|
90
96
|
if (type) {
|
|
91
|
-
const item = type
|
|
97
|
+
const item = type.map(iterator);
|
|
92
98
|
// set identity...
|
|
93
99
|
const entry = this.context.changeSet.getEntry(item, item);
|
|
94
100
|
relationMapper.fix(entry);
|
|
@@ -117,6 +123,9 @@ export default class EntityQuery {
|
|
|
117
123
|
let query;
|
|
118
124
|
let reader;
|
|
119
125
|
try {
|
|
126
|
+
if (select.model) {
|
|
127
|
+
select = { ...select, fields: select.model.getFieldMap(select.sourceParameter) };
|
|
128
|
+
}
|
|
120
129
|
query = this.context.driver.compiler.compileExpression(this, select);
|
|
121
130
|
this.traceQuery?.(query.text);
|
|
122
131
|
reader = await this.context.connection.executeReader(query, signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AACA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAuB,aAAa,EAAE,iBAAiB,EAAmB,MAAM,6BAA6B,CAAC;AAE3K,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAInE,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW;IAS5B,YAAa,CAA4B;QAErC,uBAAuB;QACvB,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,CAAgB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,CAAM,EAAE,EAAO;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,UAAe,EAAE,EAAO;QACxB,
|
|
1
|
+
{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,UAAU,EAAE,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,WAAW,MAAM,4BAA4B,CAAC;AAGrD,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,eAAe,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAkB,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvjB,OAAO,EAAE,UAAU,EAAwC,MAAM,yBAAyB,CAAC;AAC3F,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,OAAO,MAAM,cAAc,CAAC;AAQnC,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO,CAAC,UAAU,CAAC;IAOxD,OAAO,CAAC,MAAM;IACP,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,mBAAmB;IAClC,OAAO,CAAC,QAAQ;IARpB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAwB;IAEhE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;gBAG3C,MAAM,EAAE,WAAW,EACpB,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,mBAAmB,EAC1B,QAAQ,EAAE,aAAa;IAanC,KAAK,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU;IAUjC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,GAAG,SAAM,GAAG,UAAU;IAMlD,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IASpD,iBAAiB,CAAC,CAAC,EAAE,YAAY,GAAG,UAAU;IAO9C,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IAiBpD,gBAAgB,CAAC,CAAC,EAAE,eAAe;IAwBnC,iBAAiB,CAAC,CAAC,EAAE,YAAY,GAAG,UAAU;IAI9C,aAAa,CAAC,EAAC,KAAK,EAAC,EAAE,QAAQ,GAAG,UAAU;IAI5C,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,GAAG,UAAU;IAIxD,kBAAkB,CAAE,EAAE,KAAK,EAAE,EAAE,aAAa,GAAG,UAAU;IAIzD,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,GAAG,UAAU;IAKxD,mBAAmB,CAAE,EAAE,KAAK,EAAE,EAAE,cAAc,GAAG,UAAU;IAI3D,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IAKpD,mBAAmB,CAAC,CAAC,EAAE,cAAc,GAAG,UAAU;IAqDlD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU;IAqDrH,UAAU,CAAC,IAAI,EAAE,uBAAuB,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU;IAqE9I,eAAe,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;
|
|
1
|
+
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}
|
|
@@ -257,7 +257,9 @@ export default class ExpressionToSql extends Visitor {
|
|
|
257
257
|
// return r;
|
|
258
258
|
}
|
|
259
259
|
visitIdentifier(e) {
|
|
260
|
-
|
|
260
|
+
if (e.quoted) {
|
|
261
|
+
return [this.compiler.quote(e.value)];
|
|
262
|
+
}
|
|
261
263
|
return [e.value];
|
|
262
264
|
}
|
|
263
265
|
visitParameterExpression(pe) {
|
|
@@ -288,10 +290,10 @@ export default class ExpressionToSql extends Visitor {
|
|
|
288
290
|
}
|
|
289
291
|
const name = this.scope.nameOf(parameter);
|
|
290
292
|
// need to change name as per naming convention here...
|
|
291
|
-
const namingConvention = this.compiler.namingConvention;
|
|
292
|
-
if (scope.model && namingConvention) {
|
|
293
|
-
|
|
294
|
-
}
|
|
293
|
+
// const namingConvention = this.compiler.namingConvention;
|
|
294
|
+
// if (scope.model && namingConvention) {
|
|
295
|
+
// chain[0] = namingConvention(chain[0]);
|
|
296
|
+
// }
|
|
295
297
|
return [QueryParameter.create(() => name), ".", chain.join(".")];
|
|
296
298
|
}
|
|
297
299
|
}
|
|
@@ -547,7 +549,11 @@ export default class ExpressionToSql extends Visitor {
|
|
|
547
549
|
const scope = this.scope.get(pe);
|
|
548
550
|
const peModel = scope?.model;
|
|
549
551
|
if (peModel) {
|
|
550
|
-
const { relation } = peModel.getProperty(id.value);
|
|
552
|
+
const { relation, field } = peModel.getProperty(id.value);
|
|
553
|
+
if (field) {
|
|
554
|
+
// we need to replace field with column name...
|
|
555
|
+
return Expression.member(target, field.columnName);
|
|
556
|
+
}
|
|
551
557
|
if (relation) {
|
|
552
558
|
const { fkColumn } = relation;
|
|
553
559
|
if (!relation.isCollection) {
|