From 015bfb74e8f28e4a61d16a7165a591ed112e352b Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Thu, 8 Feb 2024 15:27:33 -0300 Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #386. @othonlima --- packages/basic.gblib/services/KeywordsExpressions.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/basic.gblib/services/KeywordsExpressions.ts b/packages/basic.gblib/services/KeywordsExpressions.ts index 0c2def53..53d438c0 100644 --- a/packages/basic.gblib/services/KeywordsExpressions.ts +++ b/packages/basic.gblib/services/KeywordsExpressions.ts @@ -1088,6 +1088,13 @@ export class KeywordsExpressions { } ]; + keywords[i++] = [ + /^\s*((?:[a-z]+.?)(?:(?:\w+).)(?:\w+)*)\s*=\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim, + ($0, $1, $2, $3, $4) => { + return `${$1} = await sys.merge({pid: pid, file: ${$2}, data: ${$3}, key1: ${$4}})`; + } + ]; + keywords[i++] = [ /^\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim, ($0, $1, $2, $3) => {