@ptc-org/nestjs-query-typeorm 5.0.0-alpha.0 → 5.0.1
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/package.json +2 -2
- package/src/query/filter-query.builder.d.ts +1 -0
- package/src/query/filter-query.builder.js +10 -2
- package/src/query/filter-query.builder.js.map +1 -1
- package/src/query/sql-comparison.builder.d.ts +4 -2
- package/src/query/sql-comparison.builder.js +12 -2
- package/src/query/sql-comparison.builder.js.map +1 -1
- package/src/query/where.builder.d.ts +1 -1
- package/src/query/where.builder.js.map +1 -1
- package/src/services/relation-query.service.js +11 -7
- package/src/services/relation-query.service.js.map +1 -1
- package/src/services/typeorm-query.service.js +18 -1
- package/src/services/typeorm-query.service.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-typeorm",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.1",
|
|
4
4
|
"description": "Typeorm adapter for @ptc-org/nestjs-query-core",
|
|
5
5
|
"author": "doug-martin <doug@dougamartin.com>",
|
|
6
6
|
"homepage": "https://github.com/tripss/nestjs-query#readme",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"lodash.omit": "^4.5.0",
|
|
25
25
|
"tslib": "^2.6.2",
|
|
26
26
|
"uuid": "^9.0.1",
|
|
27
|
-
"@ptc-org/nestjs-query-core": "5.0.
|
|
27
|
+
"@ptc-org/nestjs-query-core": "5.0.1",
|
|
28
28
|
"reflect-metadata": "0.2.1"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
@@ -53,6 +53,7 @@ export declare class FilterQueryBuilder<Entity> {
|
|
|
53
53
|
readonly repo: Repository<Entity>;
|
|
54
54
|
readonly whereBuilder: WhereBuilder<Entity>;
|
|
55
55
|
readonly aggregateBuilder: AggregateBuilder<Entity>;
|
|
56
|
+
private readonly virtualColumns;
|
|
56
57
|
constructor(repo: Repository<Entity>, whereBuilder?: WhereBuilder<Entity>, aggregateBuilder?: AggregateBuilder<Entity>);
|
|
57
58
|
/**
|
|
58
59
|
* Create a `typeorm` SelectQueryBuilder with `WHERE`, `ORDER BY` and `LIMIT/OFFSET` clauses.
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
|
|
6
6
|
const lodash_merge_1 = tslib_1.__importDefault(require("lodash.merge"));
|
|
7
7
|
const aggregate_builder_1 = require("./aggregate.builder");
|
|
8
|
+
const sql_comparison_builder_1 = require("./sql-comparison.builder");
|
|
8
9
|
const where_builder_1 = require("./where.builder");
|
|
9
10
|
/**
|
|
10
11
|
* @internal
|
|
@@ -12,10 +13,14 @@ const where_builder_1 = require("./where.builder");
|
|
|
12
13
|
* Class that will convert a Query into a `typeorm` Query Builder.
|
|
13
14
|
*/
|
|
14
15
|
class FilterQueryBuilder {
|
|
15
|
-
constructor(repo, whereBuilder = new where_builder_1.WhereBuilder(), aggregateBuilder = new aggregate_builder_1.AggregateBuilder(repo)) {
|
|
16
|
+
constructor(repo, whereBuilder = new where_builder_1.WhereBuilder(new sql_comparison_builder_1.SQLComparisonBuilder(sql_comparison_builder_1.SQLComparisonBuilder.DEFAULT_COMPARISON_MAP, repo)), aggregateBuilder = new aggregate_builder_1.AggregateBuilder(repo)) {
|
|
16
17
|
this.repo = repo;
|
|
17
18
|
this.whereBuilder = whereBuilder;
|
|
18
19
|
this.aggregateBuilder = aggregateBuilder;
|
|
20
|
+
this.virtualColumns = [];
|
|
21
|
+
this.virtualColumns = repo.metadata.columns
|
|
22
|
+
.filter(({ isVirtualProperty }) => isVirtualProperty)
|
|
23
|
+
.map(({ propertyName }) => propertyName);
|
|
19
24
|
}
|
|
20
25
|
/**
|
|
21
26
|
* Create a `typeorm` SelectQueryBuilder with `WHERE`, `ORDER BY` and `LIMIT/OFFSET` clauses.
|
|
@@ -119,7 +124,10 @@ class FilterQueryBuilder {
|
|
|
119
124
|
return qb;
|
|
120
125
|
}
|
|
121
126
|
return sorts.reduce((prevQb, { field, direction, nulls }) => {
|
|
122
|
-
|
|
127
|
+
let col = alias ? `${alias}.${field}` : `${field}`;
|
|
128
|
+
if (this.virtualColumns.includes(field)) {
|
|
129
|
+
col = prevQb.escape(alias ? `${alias}_${field}` : `${field}`);
|
|
130
|
+
}
|
|
123
131
|
return prevQb.addOrderBy(col, direction, nulls);
|
|
124
132
|
}, qb);
|
|
125
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":";;;;AAAA,kEASmC;AACnC,wEAAgC;AAYhC,2DAAsD;AACtD,mDAA8C;AAmD9C;;;;GAIG;AACH,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":";;;;AAAA,kEASmC;AACnC,wEAAgC;AAYhC,2DAAsD;AACtD,qEAA+D;AAC/D,mDAA8C;AAmD9C;;;;GAIG;AACH,MAAa,kBAAkB;IAG7B,YACW,IAAwB,EACxB,eAAqC,IAAI,4BAAY,CAC5D,IAAI,6CAAoB,CAAS,6CAAoB,CAAC,sBAAsB,EAAE,IAAI,CAAC,CACpF,EACQ,mBAA6C,IAAI,oCAAgB,CAAS,IAAI,CAAC;QAJ/E,SAAI,GAAJ,IAAI,CAAoB;QACxB,iBAAY,GAAZ,YAAY,CAEpB;QACQ,qBAAgB,GAAhB,gBAAgB,CAA+D;QAPzE,mBAAc,GAAa,EAAE,CAAA;QAS5C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;aACxC,MAAM,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC;aACpD,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAC5C,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAElC,EAAE,GAAG,IAAI,CAAC,2BAA2B,CACnC,EAAE,EACF,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,EAChG,KAAK,CAAC,SAAS,CAChB,CAAA;QAED,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACjD,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACnD,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;QAE7E,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,UAAU,CAAC,EAAyC,EAAE,KAAoB;QAC/E,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IAC7C,CAAC;IAEM,SAAS,CAAC,KAAoB,EAAE,SAAiC;QACtE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAChE,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAElC,EAAE,GAAG,kBAAkB;YACrB,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACvH,CAAC,CAAC,EAAE,CAAA;QAEN,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACjD,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACjD,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QAChE,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QAEhE,OAAO,EAAE,CAAA;IACX,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAChF,CAAC;IAED;;;;OAIG;IACI,UAAU,CAAC,KAAoB;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,UAAU,EAAoC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACtH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAClF,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAED;;;;;OAKG;IACI,WAAW,CAA6B,EAAK,EAAE,MAAe,EAAE,WAAqB;QAC1F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAA;QACX,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAClD,CAAC;QAED,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IAED;;;;;;OAMG;IACI,cAAc,CAAwC,EAAM,EAAE,SAAiC,EAAE,KAAc;QACpH,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAC1D,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAAuC,EAAS,EAAE,MAAuB,EAAE,KAAc;QACzG,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9H,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAA6B,EAAK,EAAE,KAA2B,EAAE,KAAc;QAChG,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YAC1D,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAe,EAAE,CAAC,CAAC,CAAC,GAAG,KAAe,EAAE,CAAA;YAEtE,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAe,CAAC,EAAE,CAAC;gBAClD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAe,EAAE,CAAC,CAAC,CAAC,GAAG,KAAe,EAAE,CAAC,CAAA;YACnF,CAAC;YAED,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACjD,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAEM,qBAAqB,CAC1B,EAAK,EACL,iBAAiD;IACjD,6DAA6D;IAC7D,KAAc;QAEd,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE;YAC1D,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,oCAAgB,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClG,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAEM,qBAAqB,CAC1B,EAAK,EACL,iBAAiD;IACjD,6DAA6D;IAC7D,KAAc;QAEd,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE;YAC1D,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,oCAAgB,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACzG,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAED;;;OAGG;IACK,kBAAkB;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAA;IACvC,CAAC;IAED;;;;;;;;OAQG;IACI,2BAA2B,CAChC,EAA8B,EAC9B,YAAqC,EACrC,eAA0C,EAC1C,KAAc;QAEd,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAExD,qDAAqD;QACrD,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjE,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAA;YACpC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAA;YAE3C,MAAM,cAAc,GAAG,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;YAClG,oEAAoE;YAEpE,IAAI,cAAc,EAAE,CAAC;gBACnB,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC,KAAK,IAAI,WAAW,EAAE,EAAE,aAAa,CAAC,CAAA;gBAClF,wCAAwC;gBACxC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;gBACvE,OAAO,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,gBAAgB,EAAE,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;YAC/G,CAAC;YAED,OAAO,IAAI,CAAC,2BAA2B,CACrC,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC,KAAK,IAAI,WAAW,EAAE,EAAE,aAAa,CAAC,EACnE,gBAAgB,EAChB,EAAE,EACF,aAAa,CACd,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,MAAuB;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAA;QAC9B,OAAO,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IACpF,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,MAAuB;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,CACL,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,KAAK,KAAK,CAAC,CAAA;YAEhG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,KAAK,CAAA;YACd,CAAC;YAED,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;gBAC7D,OAAO,KAAK,CAAA;gBACZ,qCAAqC;gBACrC,SAAS;gBACT,eAAe;YACjB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACd,CAAA;IACH,CAAC;IAEM,wCAAwC,CAC7C,QAAwB,EACxB,SAA0B,EAAE,EAC5B,kBAA4C,EAAE;QAE9C,MAAM,mBAAmB,GAAG,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;QACnG,OAAO,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,CAAA;IAChE,CAAC;IAEO,6BAA6B,CAAC,SAAuB,EAAE,UAAU,IAAI,GAAG,EAAkB;QAChG,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjE,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YAC3C,MAAM,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAA;YACrD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAExB,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,IAAI,CAAC,EAAE;oBACN,KAAK;oBACL,SAAS,EAAE,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,OAAO,CAAC;iBACjE;aACF,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAEM,+BAA+B,CACpC,QAAwB,EACxB,MAAuB,EACvB,kBAA4C,EAAE;QAE9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAA8B,CAAC,CAAC,CAAA;QAE9F,MAAM,mBAAmB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE;YAC/E,MAAM,kBAAkB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,cAAc,CAAC,IAAI,CAAC,CAAA;YAEjG,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;YAEnC,IAAI,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBACnC,sEAAsE;gBACtE,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,+BAA+B,CACnE,kBAAkB,CAAC,qBAAqB,EACxC,EAAE,EACF,cAAc,CAAC,KAAK,CAAC,SAAS,CAC/B,CAAA;YACH,CAAC;YAED,OAAO,SAAS,CAAA;QAClB,CAAC,EAAE,EAAE,CAAC,CAAA;QAEN,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;YAEpC,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC;gBACzD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;oBACxC,IAAI,GAAG,IAAA,sBAAK,EAAC,IAAI,EAAE,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAA;gBACnF,CAAC;YACH,CAAC;YAED,MAAM,kBAAkB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAA;YAElF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,IAAI,CAAC,EAAE,IAAA,sBAAK,EACV,IAAqB,CAAC,IAAI,CAAC,EAC5B,IAAI,CAAC,+BAA+B,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,eAAe,EAAE,EAAE,CAAC,CACpG;aACF,CAAA;QACH,CAAC,EAAE,mBAAmB,CAAC,CAAA;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;IAChE,CAAC;CACF;AApWD,gDAoWC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CommonFieldComparisonBetweenType, FilterComparisonOperators } from '@ptc-org/nestjs-query-core';
|
|
2
|
-
import { ObjectLiteral } from 'typeorm';
|
|
2
|
+
import { ObjectLiteral, Repository } from 'typeorm';
|
|
3
3
|
/**
|
|
4
4
|
* @internal
|
|
5
5
|
*/
|
|
@@ -17,8 +17,9 @@ export type EntityComparisonField<Entity, F extends keyof Entity> = Entity[F] |
|
|
|
17
17
|
*/
|
|
18
18
|
export declare class SQLComparisonBuilder<Entity> {
|
|
19
19
|
readonly comparisonMap: Record<string, string>;
|
|
20
|
+
readonly repo?: Repository<Entity>;
|
|
20
21
|
static DEFAULT_COMPARISON_MAP: Record<string, string>;
|
|
21
|
-
constructor(comparisonMap?: Record<string, string>);
|
|
22
|
+
constructor(comparisonMap?: Record<string, string>, repo?: Repository<Entity>);
|
|
22
23
|
private get paramName();
|
|
23
24
|
/**
|
|
24
25
|
* Creates a valid SQL fragment with parameters.
|
|
@@ -38,5 +39,6 @@ export declare class SQLComparisonBuilder<Entity> {
|
|
|
38
39
|
private betweenComparisonSQL;
|
|
39
40
|
private notBetweenComparisonSQL;
|
|
40
41
|
private isBetweenVal;
|
|
42
|
+
private getCol;
|
|
41
43
|
}
|
|
42
44
|
export {};
|
|
@@ -7,8 +7,9 @@ const common_1 = require("../common");
|
|
|
7
7
|
* Builder to create SQL Comparisons. (=, !=, \>, etc...)
|
|
8
8
|
*/
|
|
9
9
|
class SQLComparisonBuilder {
|
|
10
|
-
constructor(comparisonMap = SQLComparisonBuilder.DEFAULT_COMPARISON_MAP) {
|
|
10
|
+
constructor(comparisonMap = SQLComparisonBuilder.DEFAULT_COMPARISON_MAP, repo) {
|
|
11
11
|
this.comparisonMap = comparisonMap;
|
|
12
|
+
this.repo = repo;
|
|
12
13
|
}
|
|
13
14
|
get paramName() {
|
|
14
15
|
return `param${(0, common_1.randomString)()}`;
|
|
@@ -22,7 +23,7 @@ class SQLComparisonBuilder {
|
|
|
22
23
|
* @param alias - alias for the field.
|
|
23
24
|
*/
|
|
24
25
|
build(field, cmp, val, alias) {
|
|
25
|
-
const col =
|
|
26
|
+
const col = this.getCol(field, alias);
|
|
26
27
|
const normalizedCmp = cmp.toLowerCase();
|
|
27
28
|
if (this.comparisonMap[normalizedCmp]) {
|
|
28
29
|
// comparison operator (e.b. =, !=, >, <)
|
|
@@ -138,6 +139,15 @@ class SQLComparisonBuilder {
|
|
|
138
139
|
isBetweenVal(val) {
|
|
139
140
|
return val !== null && typeof val === 'object' && 'lower' in val && 'upper' in val;
|
|
140
141
|
}
|
|
142
|
+
getCol(field, alias) {
|
|
143
|
+
if (this.repo) {
|
|
144
|
+
const column = this.repo.metadata.columns.find(({ databasePath }) => databasePath === field);
|
|
145
|
+
if (column && column.isVirtualProperty) {
|
|
146
|
+
return `(${column.query(alias)})`;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return alias ? `${alias}.${field}` : `${field}`;
|
|
150
|
+
}
|
|
141
151
|
}
|
|
142
152
|
exports.SQLComparisonBuilder = SQLComparisonBuilder;
|
|
143
153
|
SQLComparisonBuilder.DEFAULT_COMPARISON_MAP = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":";;;AAGA,sCAAwC;AAkBxC;;;GAGG;AACH,MAAa,oBAAoB;IAc/B,
|
|
1
|
+
{"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { SQLComparisonBuilder } from './sql-comparison.builder';
|
|
|
7
7
|
* Builds a WHERE clause from a Filter.
|
|
8
8
|
*/
|
|
9
9
|
export declare class WhereBuilder<Entity> {
|
|
10
|
-
readonly sqlComparisonBuilder
|
|
10
|
+
private readonly sqlComparisonBuilder;
|
|
11
11
|
constructor(sqlComparisonBuilder?: SQLComparisonBuilder<Entity>);
|
|
12
12
|
/**
|
|
13
13
|
* Builds a WHERE clause from a Filter.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAKlC,qEAAsF;AAEtF;;;GAGG;AACH,MAAa,YAAY;IACvB,
|
|
1
|
+
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ class RelationQueryService {
|
|
|
16
16
|
}
|
|
17
17
|
const assembler = nestjs_query_core_1.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
|
|
18
18
|
const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
|
|
19
|
-
return assembler.
|
|
19
|
+
return assembler.convertToDTOs(await relationQueryBuilder.select(dto, assembler.convertQuery(query)).getMany());
|
|
20
20
|
}
|
|
21
21
|
async aggregateRelations(RelationClass, relationName, dto, filter, aggregate) {
|
|
22
22
|
if (Array.isArray(dto)) {
|
|
@@ -164,10 +164,12 @@ class RelationQueryService {
|
|
|
164
164
|
const convertedQuery = assembler.convertQuery(query);
|
|
165
165
|
const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
|
|
166
166
|
const entityRelations = await relationQueryBuilder.batchSelect(entities, convertedQuery, withDeleted).getRawAndEntities();
|
|
167
|
-
|
|
167
|
+
const results = new Map();
|
|
168
|
+
for (const entity of entities) {
|
|
168
169
|
const relations = relationQueryBuilder.relationMeta.mapRelations(entity, entityRelations.entities, entityRelations.raw);
|
|
169
|
-
|
|
170
|
-
}
|
|
170
|
+
results.set(entity, await assembler.convertToDTOs(relations));
|
|
171
|
+
}
|
|
172
|
+
return results;
|
|
171
173
|
}
|
|
172
174
|
/**
|
|
173
175
|
* Query for an array of relations for multiple dtos.
|
|
@@ -229,9 +231,11 @@ class RelationQueryService {
|
|
|
229
231
|
if ((isNullable && dtos.some((entity) => entity[relationName])) ||
|
|
230
232
|
(!isNullable && dtos.some((entity) => entity[relationName]))) {
|
|
231
233
|
const assembler = nestjs_query_core_1.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
234
|
+
const results = new Map();
|
|
235
|
+
for (const entity of dtos) {
|
|
236
|
+
results.set(entity, entity[relationName] ? await assembler.convertToDTO(entity[relationName]) : undefined);
|
|
237
|
+
}
|
|
238
|
+
return results;
|
|
235
239
|
}
|
|
236
240
|
}
|
|
237
241
|
const batchResults = await this.batchQueryRelations(RelationClass, relationName, dtos, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":";;;;AAAA,kEAUmC;AACnC,sEAAoC;AAIpC,oCAA0G;AAE1G;;;GAGG;AACH,MAAsB,oBAAoB;IAsCjC,KAAK,CAAC,cAAc,CACzB,aAA8B,EAC9B,YAAoB,EACpB,GAAsB,EACtB,KAAsB;QAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC1E,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QAEvE,OAAO,SAAS,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;IAChH,CAAC;IAkBM,KAAK,CAAC,kBAAkB,CAC7B,aAA8B,EAC9B,YAAoB,EACpB,GAAsB,EACtB,MAAwB,EACxB,SAAmC;QAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAC1F,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACvE,MAAM,WAAW,GAAG,MAAM,wBAAgB,CAAC,+BAA+B,CACxE,oBAAoB;aACjB,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;aAC9F,UAAU,EAA2B,CACzC,CAAA;QACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1E,CAAC;IAgBM,KAAK,CAAC,cAAc,CACzB,aAA8B,EAC9B,YAAoB,EACpB,GAAsB,EACtB,MAAwB;QAExB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;QAC3E,CAAC;QACD,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACvE,OAAO,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IACxF,CAAC;IA+BM,KAAK,CAAC,YAAY,CACvB,aAA8B,EAC9B,YAAoB,EACpB,GAAsB,EACtB,IAAoC;QAEpC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;QACxE,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,IAAI,cAAc,GAAG,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAEtE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;gBAClF,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;aACrB,CAAC,CAAA;YAEF,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;gBACtB,oBAAoB,CAAC,WAAW,EAAE,CAAA;YACpC,CAAC;YAED,cAAc,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,CAAA;QACtD,CAAC;QAED,OAAO,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5E,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,YAAY,CACvB,YAAoB,EACpB,EAAmB,EACnB,WAAgC,EAChC,IAA8C;QAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;QAC1F,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,cAAc,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QAC1F,CAAC;QACD,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QACnF,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,YAAY,CAChB,YAAoB,EACpB,EAAmB,EACnB,WAAgC,EAChC,IAA8C;QAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;QAC1F,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,cAAc,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1F,CAAC;QACH,CAAC;QACD,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACvE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;QAC/G,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;QAC7G,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,WAAW,CACtB,YAAoB,EACpB,EAAmB,EACnB,UAA2B,EAC3B,IAA8C;QAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/F,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,YAAY,cAAc,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QACtF,CAAC;QACD,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAClF,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,eAAe,CAC1B,YAAoB,EACpB,EAAmB,EACnB,WAAgC,EAChC,IAA8C;QAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;QAC1F,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,mBAAmB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QAC/F,CAAC;QACD,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACtF,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,cAAc,CACzB,YAAoB,EACpB,EAAmB,EACnB,UAA2B,EAC3B,IAA8C;QAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/F,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,YAAY,mBAAmB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3F,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;QAC/C,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACvF,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,uBAAuB,CAAW,IAAY;QACnD,OAAO,IAAI,4BAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,mBAAmB,CAC/B,aAA8B,EAC9B,YAAoB,EACpB,QAAkB,EAClB,KAAsB,EACtB,WAAqB;QAErB,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QAEpD,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACvE,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,QAAQ,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,iBAAiB,EAAE,CAAA;QAEzH,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,MAAM,SAAS,GAAG,oBAAoB,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,CAAA;YAEvH,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAA;QAChE,CAAC,EAAE,IAAI,GAAG,EAAsB,CAAC,CAAA;IACnC,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,uBAAuB,CACnC,aAA8B,EAC9B,YAAoB,EACpB,QAAkB,EAClB,MAAwB,EACxB,KAA+B;QAE/B,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAW,YAAY,CAAC,CAAA;QACjF,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAEzD,MAAM,aAAa,GAAG,MAAM,oBAAoB;aAC7C,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC;aAC/C,UAAU,EAAgD,CAAA;QAE7D,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YACnD,gDAAgD;YAChD,MAAM,KAAK,GAAG,WAAW,CAAC,4BAA4B,CAAA;YACtD,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACzC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;gBACb,GAAG,YAAY;gBACf,GAAG,wBAAgB,CAAC,0BAA0B,CAAC,CAAC,IAAA,qBAAU,EAAC,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC;aACnH,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,IAAI,GAAG,EAAyC,CAAC,CAAA;IACtD,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,mBAAmB,CAC/B,aAA8B,EAC9B,YAAoB,EACpB,QAAkB,EAClB,MAAwB;QAExB,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;QACpG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACvE,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAEzD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAEzH,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE;YAC9D,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC,CAAA;YAC7B,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAA;IAC/B,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,kBAAkB,CAC9B,aAA8B,EAC9B,YAAoB,EACpB,IAAc,EACd,IAAoC;QAEpC,+DAA+D;QAC/D,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,UAAU,CAAA;YAEhE,8BAA8B;YAC9B,IACE,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;gBAC3D,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAC5D,CAAC;gBACD,MAAM,SAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;gBAEpG,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBAC7G,CAAC,EAAE,IAAI,GAAG,EAAoB,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACjD,aAAa,EACb,YAAY,EACZ,IAAI,EACJ;YACE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;YAC9B,MAAM,EAAE,IAAI,EAAE,MAAM;SACrB,EACD,IAAI,EAAE,WAAW,CAClB,CAAA;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAA;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;YACrC,0BAA0B;YAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,iCAAiC,CAAC,MAAc,EAAE,YAAoB;QAC5E,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;IACzE,CAAC;IAEO,eAAe,CAAC,YAAoB;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,YAAY,CAAC,CAAA;QAC9F,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,YAAY,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QACxF,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAEO,iBAAiB,CAAC,YAAoB;QAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;QAEvD,IAAI,OAAO,YAAY,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,IAAI,YAAY,CAAC,IAAI,CAAC,CAAA;YAEtH,IAAI,gBAAgB,EAAE,CAAC;gBACrB,OAAO,gBAAgB,CAAC,MAAwB,CAAA;YAClD,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC,IAAsB,CAAA;IAC5C,CAAC;IAEO,YAAY,CAAW,YAAoB,EAAE,GAAwB,EAAE,MAAyB;QACtG,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAW,YAAY,CAAC,CAAC,kBAAkB,CAAA;QACpG,OAAO,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IACnE,CAAC;IAEO,iBAAiB,CAAW,WAAgC,EAAE,SAAqB;QACzF,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,CAAA;IAC5D,CAAC;CACF;AA9dD,oDA8dC"}
|
|
1
|
+
{"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,24 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
|
|
|
64
64
|
if (opts?.withDeleted) {
|
|
65
65
|
qb.withDeleted();
|
|
66
66
|
}
|
|
67
|
-
|
|
67
|
+
// Check if we have any relation that could cause the same record to be returned twice, if not then we create
|
|
68
|
+
// our own count as TypeORM still decides to add "DISTINCT" to it, which makes it slow
|
|
69
|
+
if (qb.expressionMap.joinAttributes.some((join) => join.isMany)) {
|
|
70
|
+
// If we have relations than do what TypeORM does
|
|
71
|
+
return qb.getCount();
|
|
72
|
+
}
|
|
73
|
+
// This is the same as TypeORM does it with the exception that the select is always COUNT(1)
|
|
74
|
+
const result = (await qb
|
|
75
|
+
.orderBy()
|
|
76
|
+
.groupBy()
|
|
77
|
+
.offset(undefined)
|
|
78
|
+
.limit(undefined)
|
|
79
|
+
.skip(undefined)
|
|
80
|
+
.take(undefined)
|
|
81
|
+
.select('COUNT(1)', 'cnt')
|
|
82
|
+
.setOption('disable-global-order')
|
|
83
|
+
.execute());
|
|
84
|
+
return parseInt(`${result?.[0]?.cnt ?? 0}`);
|
|
68
85
|
}
|
|
69
86
|
/**
|
|
70
87
|
* Find an entity by it's `id`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":";;;AAAA,2CAA6E;AAyB7E,oCAA+D;AAC/D,qEAA+D;AAO/D;;;;;;;;;;;;;;;GAeG;AACH,MAAa,mBACX,SAAQ,6CAA4B;IAOpC,YACW,IAAwB,EACjC,IAAsC;QAEtC,KAAK,EAAE,CAAA;QAHE,SAAI,GAAJ,IAAI,CAAoB;QAKjC,IAAI,CAAC,kBAAkB,GAAG,IAAI,EAAE,kBAAkB,IAAI,IAAI,0BAAkB,CAAS,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/F,IAAI,CAAC,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,KAAK,CAAA;IACnD,CAAC;IAED,gEAAgE;IAChE,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAuB,CAAA;IAC1C,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,KAAK,CAAC,KAAK,CAAC,KAAoB,EAAE,IAA2B;QAClE,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEhD,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;YACtB,EAAE,CAAC,WAAW,EAAE,CAAA;QAClB,CAAC;QAED,OAAO,EAAE,CAAC,OAAO,EAAE,CAAA;IACrB,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,MAAsB,EACtB,SAAiC,EACjC,IAAuB;QAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,CAAA;QAEnE,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;YACtB,EAAE,CAAC,WAAW,EAAE,CAAA;QAClB,CAAC;QAED,MAAM,aAAa,GAAG,EAAE,CAAC,UAAU,EAA2B,CAAA;QAC9D,OAAO,wBAAgB,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAA;IACxE,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAsB,EAAE,IAAmB;QAC5D,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAErD,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;YACtB,EAAE,CAAC,WAAW,EAAE,CAAA;QAClB,CAAC;QAED,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":"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"}
|