From 173b4348e3821affdd705d73751e1aed4fba4e95 Mon Sep 17 00:00:00 2001 From: Darkein Date: Wed, 22 Jun 2022 15:20:22 +0200 Subject: [PATCH 1/2] fix(limit): fix: use offset instead of skip --- packages/crud-typeorm/src/typeorm-crud.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts index e6118a30..fb77b10a 100644 --- a/packages/crud-typeorm/src/typeorm-crud.service.ts +++ b/packages/crud-typeorm/src/typeorm-crud.service.ts @@ -321,14 +321,14 @@ export class TypeOrmCrudService extends CrudService { const take = this.getTake(parsed, options.query); /* istanbul ignore else */ if (isFinite(take)) { - builder.take(take); + builder.limit(take); } // set skip const skip = this.getSkip(parsed, take); /* istanbul ignore else */ if (isFinite(skip)) { - builder.skip(skip); + builder.offset(skip); } } From 9dbede0d71f647ddea98559f79561b1147f2a4a3 Mon Sep 17 00:00:00 2001 From: Pierre Fiorelli Date: Wed, 22 Jun 2022 15:17:36 +0000 Subject: [PATCH 2/2] fix: getMany --- packages/crud-typeorm/src/typeorm-crud.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts index fb77b10a..6c2162ef 100644 --- a/packages/crud-typeorm/src/typeorm-crud.service.ts +++ b/packages/crud-typeorm/src/typeorm-crud.service.ts @@ -358,8 +358,8 @@ export class TypeOrmCrudService extends CrudService { ): Promise | T[]> { if (this.decidePagination(query, options)) { const [data, total] = await builder.getManyAndCount(); - const limit = builder.expressionMap.take; - const offset = builder.expressionMap.skip; + const limit = builder.expressionMap.limit; + const offset = builder.expressionMap.offset; return this.createPageInfo(data, total, limit || total, offset || 0); }