add variables replacement before macros replacement

Author: Roman M

pkg/eval/eval_query.go

@@ -291,7 +291,7 @@ func (q *EvalQuery) escapeIdentifier(identifier string) string {
 }
 
 func (q *EvalQuery) escapeTableIdentifier(identifier string) string {
-	if regexp.MustCompile(`^[a-zA-Z][0-9a-zA-Z_]+$`).MatchString(identifier) {
+	if regexp.MustCompile(`^[$a-zA-Z][0-9a-zA-Z_]+$`).MatchString(identifier) {
 		return identifier
 	} else {
 		return "`" + strings.Replace(identifier, "`", "\\`", -1) + "`"

src/datasource/datasource.ts

@@ -803,6 +803,13 @@ export class CHDataSource
         },
       };
 
+      // Apply template variable replacements (these don't require backend processing)
+      queryData.query = this.templateSrv.replace(
+        conditionalTest(queryData.query, this.templateSrv),
+        options.scopedVars,
+        createContextAwareInterpolation(queryData.query, this.templateSrv.getVariables())
+      );
+
       // SAFE OPTIMIZATION: Batch createQuery + applyAdhocFilters (reduces 3->2 calls)
       const queryResult = await this.resourceClient.createQueryWithAdhoc(queryData, adhocFilters);