Merge pull request #122 from doitintl/issue-120

Fixes #120

Author: avivl

dist/module.js

@@ -38,9 +38,9 @@
         "googleapis": "^37.2.0",
         "grafana-sdk-mocks": "github:grafana/grafana-sdk-mocks",
         "jest": "^24.5.0",
+        "lodash": "^4.17.11",
         "ng-annotate-webpack-plugin": "^0.3.0",
         "plugin-typescript": "^8.0.0",
-        "plugin-typescript": "^8.0.0",
         "prettier": "^1.16.4",
         "sinon": "^3.3.0",
         "systemjs-plugin-css": "^0.1.35",
@@ -54,7 +54,6 @@
         "typescript": "^3.3.4000",
         "uglifyjs-webpack-plugin": "^2.1.1",
         "webpack": "^4.29.5",
-        "webpack-cli": "^3.2.3",
-        "lodash": "^4.17.11"
+        "webpack-cli": "^3.2.3"
     }
 }

dist/module.js.map

@@ -185,8 +185,15 @@ export class BigQueryDatasource {
         format: target.format,
         intervalMs: options.intervalMs,
         maxDataPoints: options.maxDataPoints,
+        metricColumn: target.metricColumn,
+        partitioned: target.partitioned,
+        partitionedField: target.partitionedField,
         rawSql: queryModel.render(this.interpolateVariable),
-        refId: target.refId
+        refId: target.refId,
+        sharded: target.sharded,
+        table: target.table,
+        timeColumn: target.timeColumn,
+        timeColumnType: target.timeColumnType
       };
     });
 
@@ -201,7 +208,14 @@ export class BigQueryDatasource {
     });
     const allQueryPromise = _.map(queries, query => {
       const tmpQ = this.queryModel.target.rawSql;
+      this.queryModel.target.metricColumn = query.metricColumn;
+      this.queryModel.target.partitioned = query.partitioned;
+      this.queryModel.target.partitionedField = query.partitionedField;
       this.queryModel.target.rawSql = query.rawSql;
+      this.queryModel.target.sharded = query.sharded;
+      this.queryModel.target.table = query.table;
+      this.queryModel.target.timeColumn = query.timeColumn;
+      this.queryModel.target.timeColumnType = query.timeColumnType;
       const modOptions = BigQueryDatasource._setupTimeShiftQuery(
         query,
         options