🐛 Fix: macros regex and quotations (#125)

* 🐛 Fix: macros regex and quotations

* 🔖 Chore: update version and changelog

Author: mullerpeter

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## 1.3.7
+## 1.3.8
+
+- Refactor: User context for oauth token pass-through
+- Bugfix: Allow . in macro column names & fix quotation for timeFrom and timeTo macros
+
+---
+
+### 1.3.7
 
 - Refactor: Rename Azure entra pass-through Auth Methof to OAuth pass-through
 - Bugfix: CallResource OAuthtoken pass-through

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mullerpeter-databricks-datasource",
   "private": true,
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "Databricks SQL Connector",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

pkg/plugin/query.go

@@ -36,36 +36,36 @@ func replaceMacros(sqlQuery string, query backend.DataQuery) string {
 
 	interval_string := getIntervalString(query.Interval)
 
-	var rgx = regexp.MustCompile(`\$__timeWindow\(([a-zA-Z0-9_-]+)\)`)
+	var rgx = regexp.MustCompile(`\$__timeWindow\(([a-zA-Z0-9_.-]+)\)`)
 	if rgx.MatchString(queryString) {
 		log.DefaultLogger.Info("__timeWindow placeholder found")
 		rs := rgx.FindStringSubmatch(queryString)
 		timeColumnName := rs[1]
 		queryString = rgx.ReplaceAllString(queryString, fmt.Sprintf("window(%s, '%s')", timeColumnName, interval_string))
 
-		rgx = regexp.MustCompile(`\$__time\(([a-zA-Z0-9_-]+)\)`)
+		rgx = regexp.MustCompile(`\$__time\(([a-zA-Z0-9_.-]+)\)`)
 		if rgx.MatchString(queryString) {
 			log.DefaultLogger.Info("__time placeholder found")
 			queryString = rgx.ReplaceAllString(queryString, "window.start")
 		}
 
-		rgx = regexp.MustCompile(`\$__value\(([a-zA-Z0-9_-]+)\)`)
+		rgx = regexp.MustCompile(`\$__value\(([a-zA-Z0-9_.-]+)\)`)
 		if rgx.MatchString(queryString) {
 			log.DefaultLogger.Info("__value placeholder found")
 			rs = rgx.FindStringSubmatch(queryString)
 			valueColumnName := rs[1]
 			queryString = rgx.ReplaceAllString(queryString, fmt.Sprintf("avg(%s) AS value", valueColumnName))
 		}
 	} else {
-		rgx = regexp.MustCompile(`\$__time\(([a-zA-Z0-9_-]+)\)`)
+		rgx = regexp.MustCompile(`\$__time\(([a-zA-Z0-9_.-]+)\)`)
 		if rgx.MatchString(queryString) {
 			log.DefaultLogger.Info("__time placeholder found")
 			rs := rgx.FindStringSubmatch(queryString)
 			timeColumnName := rs[1]
 			queryString = rgx.ReplaceAllString(queryString, fmt.Sprintf("%s AS time", timeColumnName))
 		}
 
-		rgx = regexp.MustCompile(`\$__value\(([a-zA-Z0-9_-]+)\)`)
+		rgx = regexp.MustCompile(`\$__value\(([a-zA-Z0-9_.-]+)\)`)
 		if rgx.MatchString(queryString) {
 			log.DefaultLogger.Info("__value placeholder found")
 			rs := rgx.FindStringSubmatch(queryString)
@@ -80,7 +80,7 @@ func replaceMacros(sqlQuery string, query backend.DataQuery) string {
 	}
 
 	timeGroupMacros := []timeGroupMacroType{
-		{`\$__timeGroup\(([a-zA-Z0-9_-]+),'([a-zA-Z0-9_-]+)'\)`, "window(%s, '%s')"},
+		{`\$__timeGroup\(([a-zA-Z0-9_.-]+),'([a-zA-Z0-9_.-]+)'\)`, "window(%s, '%s')"},
 	}
 
 	for _, timeGroupMacro := range timeGroupMacros {
@@ -101,9 +101,9 @@ func replaceMacros(sqlQuery string, query backend.DataQuery) string {
 		to          string
 	}
 	timefilterMacros := []timeFilterMacroType{
-		{`\$__timeFilter\(([a-zA-Z0-9_-]+)\)`, "%s BETWEEN '%s' AND '%s'", query.TimeRange.From.UTC().Format("2006-01-02 15:04:05"), query.TimeRange.To.UTC().Format("2006-01-02 15:04:05")},
-		{`\$__unixEpochNanoFilter\(([a-zA-Z0-9_-]+)\)`, "%s BETWEEN %s AND %s", fmt.Sprintf("%d", query.TimeRange.From.UnixNano()), fmt.Sprintf("%d", query.TimeRange.To.UnixNano())},
-		{`\$__unixEpochFilter\(([a-zA-Z0-9_-]+)\)`, "%s BETWEEN %s AND %s", fmt.Sprintf("%d", query.TimeRange.From.Unix()), fmt.Sprintf("%d", query.TimeRange.To.Unix())},
+		{`\$__timeFilter\(([a-zA-Z0-9_.-]+)\)`, "%s BETWEEN '%s' AND '%s'", query.TimeRange.From.UTC().Format("2006-01-02 15:04:05"), query.TimeRange.To.UTC().Format("2006-01-02 15:04:05")},
+		{`\$__unixEpochNanoFilter\(([a-zA-Z0-9_.-]+)\)`, "%s BETWEEN %s AND %s", fmt.Sprintf("%d", query.TimeRange.From.UnixNano()), fmt.Sprintf("%d", query.TimeRange.To.UnixNano())},
+		{`\$__unixEpochFilter\(([a-zA-Z0-9_.-]+)\)`, "%s BETWEEN %s AND %s", fmt.Sprintf("%d", query.TimeRange.From.Unix()), fmt.Sprintf("%d", query.TimeRange.To.Unix())},
 	}
 
 	for _, timefilterMacro := range timefilterMacros {
@@ -128,9 +128,14 @@ func replaceMacros(sqlQuery string, query backend.DataQuery) string {
 		"$__unixEpochTo()":       fmt.Sprintf("%d", query.TimeRange.To.Unix()),
 		"$__unixEpochNanoFrom()": fmt.Sprintf("%d", query.TimeRange.From.UnixNano()),
 		"$__unixEpochNanoTo()":   fmt.Sprintf("%d", query.TimeRange.To.UnixNano()),
-		"$__timeFrom":            query.TimeRange.From.UTC().Format("2006-01-02 15:04:05"),
-		"$__timeTo":              query.TimeRange.To.UTC().Format("2006-01-02 15:04:05"),
-		"$__interval":            interval_string,
+
+		// Backwards compatibility
+		"'$__timeFrom'": fmt.Sprintf("'%s'", query.TimeRange.From.UTC().Format("2006-01-02 15:04:05")),
+		"'$__timeTo'":   fmt.Sprintf("'%s'", query.TimeRange.To.UTC().Format("2006-01-02 15:04:05")),
+
+		"$__timeFrom": fmt.Sprintf("'%s'", query.TimeRange.From.UTC().Format("2006-01-02 15:04:05")),
+		"$__timeTo":   fmt.Sprintf("'%s'", query.TimeRange.To.UTC().Format("2006-01-02 15:04:05")),
+		"$__interval": interval_string,
 	}
 
 	for macro, replacement := range simpleMacros {