From 15b6d9ebc0a012f403e826865117954079d95581 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Tue, 10 Oct 2023 12:48:52 -0300 Subject: [PATCH] new(basic.gblib): Allow TABLE keyword multiple times per file #383. --- packages/basic.gblib/services/SystemKeywords.ts | 2 ++ packages/core.gbapp/services/GBConfigService.ts | 2 +- packages/core.gbapp/services/GBCoreService.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index 518c425c..31310887 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -2204,10 +2204,12 @@ export class SystemKeywords { await t.update(obj, { where: { key1: key1Value } }); } else { + const cell = `${this.numberToLetters(j)}${i + 1}`; const address = `${cell}:${cell}`; if (value !== found[columnName]) { + await this.set({ pid, handle: null, file, address, value }); merges++; } diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index 46468b4e..523eea19 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -107,7 +107,7 @@ export class GBConfigService { case 'STORAGE_DIALECT': value = undefined; break; - case 'STORAGE_STORAGE': + case 'STORAGE_FILE': value = './guaribas.sqlite'; break; case 'GBKB_AUTO_DEPLOY': diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index b253bc4c..66eef279 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -128,7 +128,7 @@ export class GBCoreService implements IGBCoreService { username = GBConfigService.get('STORAGE_USERNAME'); password = GBConfigService.get('STORAGE_PASSWORD'); } else if (this.dialect === 'sqlite') { - storage = GBConfigService.get('STORAGE_STORAGE'); + storage = GBConfigService.get('STORAGE_FILE'); } else { throw new Error(`Unknown dialect: ${this.dialect}.`); }