Merge pull request #15 from mullerpeter/bugfix/scoped-variables

🐛 fix: use scoped variables in template replacment

Author: mullerpeter

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
+## 1.1.2
+
+- Use scoped Variables in template variable replacement
+
+---
+
 ### 1.1.0
 
 - Adds proper type reflection to support all databricks data types. (except type `BINARY` which is not supported)
----
 
 ### 1.0.0
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mullerpeter-databricks-datasource",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Databricks SQL Connector",
   "scripts": {
     "build": "grafana-toolkit plugin:build",

src/datasource.ts

@@ -1,16 +1,16 @@
-import { DataSourceInstanceSettings } from '@grafana/data';
+import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
 import { DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime';
 import { MyDataSourceOptions, MyQuery } from './types';
 
 export class DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOptions> {
   constructor(instanceSettings: DataSourceInstanceSettings<MyDataSourceOptions>) {
     super(instanceSettings);
   }
-  applyTemplateVariables(query: MyQuery) {
+  applyTemplateVariables(query: MyQuery, scopedVars: ScopedVars) {
     const templateSrv = getTemplateSrv();
     return {
       ...query,
-      rawSqlQuery: query.rawSqlQuery ? templateSrv.replace(query.rawSqlQuery) : ''
+      rawSqlQuery: query.rawSqlQuery ? templateSrv.replace(query.rawSqlQuery, scopedVars) : ''
     };
   }
 }