From 7a01a86ddb68f7e595213a36533a57b457b77b5c Mon Sep 17 00:00:00 2001 From: rozetko Date: Fri, 13 Jan 2023 20:06:27 +0300 Subject: [PATCH] SQL: support Grafana aggregation macros ($__timeGroup and $__timeGroupAlias) --- src/connectors/utils.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/connectors/utils.ts b/src/connectors/utils.ts index 3892437..9d4aec5 100644 --- a/src/connectors/utils.ts +++ b/src/connectors/utils.ts @@ -8,6 +8,12 @@ export function processSQLLimitOffset(sql: string, limit: number, offset: number } sql = splits[0]; // removes ";" from EOL + const reAggregation = /\$__timeGroup(?:Alias)?\(\s*([^,]+)\s*,\s*\$__interval[^\)]*\)/igm; + const occurence = reAggregation.exec(sql); + if(occurence) { + sql = sql.replace(reAggregation, occurence[1]); + } + let relim = /limit [0-9]+/ig; let reoff = /offset [0-9]+/ig;