From 9ff812eecddd7a8750f6ccbcbaee1120ea9cf426 Mon Sep 17 00:00:00 2001 From: Vadim Ogievetsky Date: Tue, 28 Jan 2025 16:48:58 -0800 Subject: [PATCH] account for merge queries --- web-console/lib/keywords.ts | 3 +++ .../src/druid-models/workbench-query/workbench-query.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web-console/lib/keywords.ts b/web-console/lib/keywords.ts index 5985ae0a6aa6..0305f7f7de38 100644 --- a/web-console/lib/keywords.ts +++ b/web-console/lib/keywords.ts @@ -60,6 +60,7 @@ export const SQL_KEYWORDS = [ 'TIME', 'INSERT INTO', 'REPLACE INTO', + 'MERGE INTO', 'OVERWRITE', 'RETURNING', 'OVER', @@ -73,6 +74,8 @@ export const SQL_KEYWORDS = [ 'EXTEND', 'PIVOT', 'UNPIVOT', + 'MATCHED', + 'UPDATE SET', ]; export const SQL_EXPRESSION_PARTS = [ diff --git a/web-console/src/druid-models/workbench-query/workbench-query.ts b/web-console/src/druid-models/workbench-query/workbench-query.ts index 9b1ed42b516b..6ac6bba3c2a8 100644 --- a/web-console/src/druid-models/workbench-query/workbench-query.ts +++ b/web-console/src/druid-models/workbench-query/workbench-query.ts @@ -404,7 +404,7 @@ export class WorkbenchQuery { if (this.isJsonLike()) return false; - return /(?:INSERT|REPLACE)\s+INTO/i.test(queryString); + return /(?:INSERT|REPLACE|MERGE)\s+INTO/i.test(queryString); } public toggleUnlimited(): WorkbenchQuery {