Fixes #221

Author: avivl

dist/module.js

@@ -59880,14 +59880,14 @@ function () {
             _this.getDateFields(project, dataset, table_1).then(function (dateFields) {
               var tm = BigQueryDatasource._FindTimeField(tmpQ, dateFields);
 
-              _this.queryModel.target.rawSql = query.rawSql;
               _this.queryModel.target.timeColumn = tm.text;
               _this.queryModel.target.timeColumnType = tm.value;
               _this.queryModel.target.table = table_1;
             })["catch"](function (err) {
               console.log(err);
             });
 
+            _this.queryModel.target.rawSql = query.rawSql;
             modOptions = BigQueryDatasource._setupTimeShiftQuery(query, options);
 
             var q = _this.setUpQ(modOptions, options, query);
@@ -60228,6 +60228,7 @@ function () {
   };
 
   BigQueryDatasource.prototype.setUpQ = function (modOptions, options, query) {
+    console.log("setUpQ  this.queryModel.target.rawSql", this.queryModel.target.rawSql);
     var q = this.queryModel.expend_macros(modOptions);
     q = BigQueryDatasource._updatePartition(q, modOptions);
     q = BigQueryDatasource._updateTableSuffix(q, modOptions);

dist/module.js.map

@@ -312,18 +312,15 @@ export class BigQueryDatasource {
         this.getDateFields(project, dataset, table)
           .then(dateFields => {
             const tm = BigQueryDatasource._FindTimeField(tmpQ, dateFields);
-            this.queryModel.target.rawSql = query.rawSql;
             this.queryModel.target.timeColumn = tm.text;
             this.queryModel.target.timeColumnType = tm.value;
             this.queryModel.target.table = table;
           })
           .catch(err => {
             console.log(err);
           });
-        modOptions = BigQueryDatasource._setupTimeShiftQuery(
-          query,
-          options
-        );
+        this.queryModel.target.rawSql = query.rawSql;
+        modOptions = BigQueryDatasource._setupTimeShiftQuery(query, options);
         const q = this.setUpQ(modOptions, options, query);
         console.log(q);
         return this.doQuery(q, options.panelId + query.refId).then(
@@ -523,6 +520,7 @@ export class BigQueryDatasource {
       );
   }
   private setUpQ(modOptions, options, query) {
+    console.log("setUpQ  this.queryModel.target.rawSql", this.queryModel.target.rawSql)
     let q = this.queryModel.expend_macros(modOptions);
     q = BigQueryDatasource._updatePartition(q, modOptions);
     q = BigQueryDatasource._updateTableSuffix(q, modOptions);