@wisemen/nestjs-typeorm 0.0.25 → 0.0.26
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.
|
@@ -3,4 +3,7 @@ export declare class TypeOrmRepository<T extends ObjectLiteral> extends Reposito
|
|
|
3
3
|
constructor(entity: EntityTarget<T>, manager: EntityManager);
|
|
4
4
|
findInBatches(options: FindOneOptions<T>, batchSize: number): AsyncGenerator<T[], void, void>;
|
|
5
5
|
findByInBatches(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], batchSize: number): AsyncGenerator<T[], void, void>;
|
|
6
|
+
private addOffsetKeyToWhere;
|
|
7
|
+
private addOffsetKeyToWhereCondition;
|
|
8
|
+
private addOffsetKeyToOrder;
|
|
6
9
|
}
|
|
@@ -9,15 +9,14 @@ export class TypeOrmRepository extends Repository {
|
|
|
9
9
|
throw new Error(`Entity ${this.metadata.name} has a composite primary key and cannot be fetched in batches`);
|
|
10
10
|
}
|
|
11
11
|
const primaryKey = this.metadata.primaryColumns[0].propertyName;
|
|
12
|
+
if (options.order !== undefined && primaryKey in options.order) {
|
|
13
|
+
throw new Error(`Cannot specify order for primary key "${this.metadata.name}.${primaryKey}" when fetching in batches`);
|
|
14
|
+
}
|
|
12
15
|
let lastPrimaryKeyValue = undefined;
|
|
13
16
|
let entities = [];
|
|
14
17
|
do {
|
|
15
|
-
const where =
|
|
16
|
-
|
|
17
|
-
: options.where;
|
|
18
|
-
const order = options.order !== undefined && primaryKey in options.order
|
|
19
|
-
? options.order
|
|
20
|
-
: { ...options.order, [primaryKey]: 'ASC' };
|
|
18
|
+
const where = this.addOffsetKeyToWhere(options.where, primaryKey, lastPrimaryKeyValue);
|
|
19
|
+
const order = this.addOffsetKeyToOrder(options.order, primaryKey);
|
|
21
20
|
entities = await this.find({
|
|
22
21
|
...options,
|
|
23
22
|
where,
|
|
@@ -33,5 +32,26 @@ export class TypeOrmRepository extends Repository {
|
|
|
33
32
|
findByInBatches(where, batchSize) {
|
|
34
33
|
return this.findInBatches({ where }, batchSize);
|
|
35
34
|
}
|
|
35
|
+
addOffsetKeyToWhere(where, key, lastKeyValue) {
|
|
36
|
+
if (lastKeyValue === undefined) {
|
|
37
|
+
return where;
|
|
38
|
+
}
|
|
39
|
+
if (Array.isArray(where)) {
|
|
40
|
+
return where.map(condition => this.addOffsetKeyToWhereCondition(condition, key, lastKeyValue));
|
|
41
|
+
}
|
|
42
|
+
return this.addOffsetKeyToWhereCondition(where, key, lastKeyValue);
|
|
43
|
+
}
|
|
44
|
+
addOffsetKeyToWhereCondition(where, key, lastKeyValue) {
|
|
45
|
+
return {
|
|
46
|
+
...where,
|
|
47
|
+
[key]: MoreThan(lastKeyValue)
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
addOffsetKeyToOrder(order, key) {
|
|
51
|
+
return {
|
|
52
|
+
...order,
|
|
53
|
+
[key]: 'ASC'
|
|
54
|
+
};
|
|
55
|
+
}
|
|
36
56
|
}
|
|
37
57
|
//# sourceMappingURL=repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6F,QAAQ,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAA;AACxJ,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAEhE,MAAM,OAAO,iBAA2C,SAAQ,UAAc;IAC5E,YAAa,MAAuB,EAAE,OAAsB;QAC1D,KAAK,CAAC,MAAM,EAAE,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAA,CAAE,aAAa,CAClB,OAA0B,EAC1B,SAAiB;QAEjB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,+DAA+D,CAAC,CAAA;QAC9G,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;QAE/D,IAAI,
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6F,QAAQ,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAA;AACxJ,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAEhE,MAAM,OAAO,iBAA2C,SAAQ,UAAc;IAC5E,YAAa,MAAuB,EAAE,OAAsB;QAC1D,KAAK,CAAC,MAAM,EAAE,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAA,CAAE,aAAa,CAClB,OAA0B,EAC1B,SAAiB;QAEjB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,+DAA+D,CAAC,CAAA;QAC9G,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;QAE/D,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,yCAAyC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,UAAU,4BAA4B,CAAC,CAAA;QACxH,CAAC;QAED,IAAI,mBAAmB,GAAY,SAAS,CAAA;QAC5C,IAAI,QAAQ,GAAQ,EAAE,CAAA;QAEtB,GAAG,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAA;YACtF,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;YAEjE,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBACzB,GAAG,OAAO;gBACV,KAAK;gBACL,KAAK;gBACL,IAAI,EAAE,SAAS;aAChB,CAAC,CAAA;YAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAEjC,MAAM,QAAQ,CAAA;YAEd,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QACrD,CAAC,QAAQ,mBAAmB,KAAK,SAAS,EAAC;IAC7C,CAAC;IAED,eAAe,CACb,KAAkD,EAClD,SAAiB;QAEjB,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,CAAC,CAAA;IACjD,CAAC;IAEO,mBAAmB,CACzB,KAA8D,EAC9D,GAAW,EACX,YAAqB;QAErB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAC3B,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,GAAG,EAAE,YAAY,CAAC,CAChE,CAAA;QACH,CAAC;QAED,OAAO,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,CAAC,CAAA;IACpE,CAAC;IAEO,4BAA4B,CAClC,KAAsC,EACtC,GAAW,EACX,YAAqB;QAErB,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC;SACP,CAAA;IAC1B,CAAC;IAEO,mBAAmB,CACzB,KAAsC,EACtC,GAAW;QAEX,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,KAAK;SACU,CAAA;IAC1B,CAAC;CACF"}
|