@ptc-org/nestjs-query-typeorm 5.0.0 → 5.1.0-alpha.0
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-typeorm",
|
|
3
|
-
"version": "5.0.0",
|
|
3
|
+
"version": "5.1.0-alpha.0",
|
|
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.0",
|
|
27
|
+
"@ptc-org/nestjs-query-core": "5.1.0-alpha.0",
|
|
28
28
|
"reflect-metadata": "0.2.1"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
@@ -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 than 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 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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"}
|