Fixes #107

Author: avivl

dist/module.js

@@ -51270,7 +51270,18 @@ function () {
   };
 
   BigQueryQuery.quoteFiledName = function (value) {
-    return "`" + String(value) + "`";
+    var vals = value.split(".");
+    var res = "";
+
+    for (var i = 0; i < vals.length; i++) {
+      res = res + "`" + String(vals[i]) + "`";
+
+      if (vals.length > 1 && i + 1 < vals.length) {
+        res = res + ".";
+      }
+    }
+
+    return res;
   };
 
   BigQueryQuery.formatDateToString = function (date, separator, addtime) {
@@ -51449,7 +51460,7 @@ function () {
 
   BigQueryQuery.prototype.buildMetricColumn = function () {
     if (this.hasMetricColumn()) {
-      return BigQueryQuery.quoteFiledName(this.target.metricColumn) + " AS metric";
+      return "CAST (" + BigQueryQuery.quoteFiledName(this.target.metricColumn) + "AS String ) AS metric";
     }
 
     return "";

dist/module.js.map

@@ -11,7 +11,15 @@ export default class BigQueryQuery {
   }
 
   public static quoteFiledName(value) {
-    return "`" + String(value) + "`";
+    const vals = value.split(".");
+    let res = "";
+    for (let i = 0; i < vals.length; i++) {
+      res = res + "`" + String(vals[i]) + "`";
+      if (vals.length > 1 && i + 1 < vals.length) {
+        res = res + ".";
+      }
+    }
+    return res;
   }
   public static formatDateToString(date, separator = "", addtime = false) {
     // 01, 02, 03, ... 29, 30, 31
@@ -206,7 +214,9 @@ export default class BigQueryQuery {
   public buildMetricColumn() {
     if (this.hasMetricColumn()) {
       return (
-        BigQueryQuery.quoteFiledName(this.target.metricColumn) + " AS metric"
+        "CAST (" +
+        BigQueryQuery.quoteFiledName(this.target.metricColumn) +
+        "AS String ) AS metric"
       );
     }
 

src/bigquery_query.ts

@@ -53,9 +53,9 @@ describe("BigQueryQuery", () => {
     const query = new BigQueryQuery({}, templateSrv);
     expect(query.buildMetricColumn()).toBe("");
     query.target.metricColumn = "host";
-    expect(query.buildMetricColumn()).toBe("`host` AS metric");
+    expect(query.buildMetricColumn()).toBe("CAST (`host`AS String ) AS metric");
     query.target.metricColumn = '"host"';
-    expect(query.buildMetricColumn()).toBe( "`\"host\"` AS metric");
+    expect(query.buildMetricColumn()).toBe( "CAST (`\"host\"`AS String ) AS metric");
   });
 
   describe("When generating value column SQL", () => {
@@ -226,7 +226,7 @@ describe("BigQueryQuery", () => {
 
     query.target.metricColumn = "m";
     result =
-      "#standardSQL\nSELECT\n `t` AS time,\n  `m` AS metric,\n  `value`\nFROM `undefined.undefined.table`\nORDER BY 1,2";
+      "#standardSQL\nSELECT\n `t` AS time,\n  CAST (`m`AS String ) AS metric,\n  `value`\nFROM `undefined.undefined.table`\nORDER BY 1,2";
     expect(query.buildQuery()).toBe(result);
   });