From 9e6ae42a5df0b808073b5aa0be0d81535999412a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sat, 16 Dec 2023 22:37:34 -0300 Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima --- packages/basic.gblib/services/SystemKeywords.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index 67c85072..da8d6343 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -2152,14 +2152,13 @@ export class SystemKeywords { let page = 0, pageSize = 1000; let count = 0; - while (page === 0 || count !== pageSize) { - - rows = [ - await t.findAll( - {offset:page * pageSize, limit:pageSize, subquery:false, where:{}} - ), ...rows]; + while (page === 0 || count === pageSize) { + const paged = await t.findAll( + {offset:page * pageSize, limit:pageSize, subquery:false, where:{}} + ); + rows = [paged, ...rows]; page++; - count = rows.length; + count = paged.length; } }, {