Merge pull request #163 from Vertamedia/issue-159

Update rawQuery value for targets
Altinity · Jan 15, 2020 · 0c1a51c · 0c1a51c
2 parents acd0d89 + 5c45b32
commit 0c1a51c
Show file tree

Hide file tree

Showing 4 changed files with 56,146 additions and 24 deletions.
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -26,6 +26,7 @@ export class ClickHouseDatasource {
     xHeaderUser: string;
     xHeaderKey: string;
     useYandexCloudAuthorization: boolean;
+    targetsRef: any;
 
     /** @ngInject */
     constructor(instanceSettings,
@@ -47,6 +48,7 @@ export class ClickHouseDatasource {
         this.xHeaderUser = instanceSettings.jsonData.xHeaderUser;
         this.xHeaderKey = instanceSettings.jsonData.xHeaderKey;
         this.useYandexCloudAuthorization = instanceSettings.jsonData.useYandexCloudAuthorization;
+        this.targetsRef = {};
     }
 
     _getRequestOptions(query: string, usePOST?: boolean, requestId?: string) {
@@ -161,7 +163,11 @@ export class ClickHouseDatasource {
             let queryAST = new Scanner(stmt).toAST();
             keys = queryAST['group by'] || [];
         } catch (err) {
-            console.log('AST parser error: ', err)
+            console.log('AST parser error: ', err);
+        }
+
+        if (this.targetsRef && this.targetsRef[target.refId]) {
+            this.targetsRef[target.refId].rawQuery = stmt;
         }
 
         return {

diff --git a/src/query_ctrl.ts b/src/query_ctrl.ts
@@ -48,6 +48,9 @@ class SqlQueryCtrl extends QueryCtrl {
         super($scope, $injector);
 
         this.queryModel = new SqlQuery(this.target, templateSrv, this.panel.scopedVars);
+        if (this.datasource.targetsRef) {
+            this.datasource.targetsRef[this.target.refId] = this.target;
+        }
 
         let defaultDatabaseSegment = {fake: true, value: '-- database --'};
         if (this.datasource.defaultDatabase.length > 0) {