Fixes #44

Author: avivl

dist/module.js

@@ -33996,8 +33996,6 @@ function () {
   };
 
   BigQueryQuery.prototype.expend_macros = function (options) {
-    console.log(this.target.rawSql);
-
     if (this.target.rawSql) {
       var q = this.target.rawSql;
       q = this.replaceTimeFilters(q, options);
@@ -34306,10 +34304,12 @@ function () {
         }
 
         allQueryPromise = _lodash2.default.map(queries, function (query) {
+          var tmpQ = _this.queryModel.target.rawSql;
           _this.queryModel.target.rawSql = query.rawSql;
 
           var q = _this.queryModel.expend_macros(options);
 
+          _this.queryModel.target.rawSql = tmpQ;
           return _this.doQuery(q, options.panelId + query.refId).then(function (response) {
             return _response_parser2.default.parseDataQuery(response, query.format);
           });

dist/module.js.map

@@ -434,7 +434,6 @@ export default class BigQueryQuery {
   }
 
   public expend_macros(options) {
-    console.log(this.target.rawSql)
     if (this.target.rawSql) {
       let q = this.target.rawSql;
       q = this.replaceTimeFilters(q, options);

src/bigquery_query.ts

@@ -95,8 +95,10 @@ export class BigQueryDatasource {
       return this.$q.when({ data: [] });
     }
     const allQueryPromise = _.map(queries, query => {
+      const tmpQ = this.queryModel.target.rawSql;
       this.queryModel.target.rawSql = query.rawSql;
       const q = this.queryModel.expend_macros(options);
+      this.queryModel.target.rawSql = tmpQ;
       return this.doQuery(q, options.panelId + query.refId).then(response => {
         return ResponseParser.parseDataQuery(response, query.format);
       });