Merge pull request #95 from doitintl/issue-90

Fixes #90

Author: avivl

dist/module.js

@@ -51698,6 +51698,11 @@ function () {
       to = "TIMESTAMP_MILLIS (" + options.range.to.valueOf().toString() + ")";
     }
 
+    if (this.target.timeColumn === "-- time --") {
+      var myRegexp = /\$__timeFilter\(([\w_.]+)\)/g;
+      this.target.timeColumn = myRegexp.exec(q)[1];
+    }
+
     var range = this.target.timeColumn + " BETWEEN " + from + " AND " + to;
     return q.replace(/\$__timeFilter\(([\w_.]+)\)/g, range);
   };

dist/module.js.map

@@ -504,7 +504,10 @@ export default class BigQueryQuery {
         "TIMESTAMP_MILLIS (" + options.range.from.valueOf().toString() + ")";
       to = "TIMESTAMP_MILLIS (" + options.range.to.valueOf().toString() + ")";
     }
-
+    if (this.target.timeColumn === "-- time --") {
+      const myRegexp = /\$__timeFilter\(([\w_.]+)\)/g;
+      this.target.timeColumn = myRegexp.exec(q)[1];
+    }
     const range = this.target.timeColumn + " BETWEEN " + from + " AND " + to;
     return q.replace(/\$__timeFilter\(([\w_.]+)\)/g, range);
   }