Merge pull request #78 from doitintl/issue-77

datasource should be able to handle spaces between parameters in macros

Author: avivl

dist/module.js

@@ -51296,7 +51296,7 @@ function () {
     var res = alias ? q.match(/(.*\$__timeGroupAlias\(([\w._]+,)).*?(?=\))/g) : q.match(/(.*\$__timeGroup\(([\w_.]+,)).*?(?=\))/g);
 
     if (res) {
-      res = res[0].substr(1 + res[0].lastIndexOf(","));
+      res = res[0].substr(1 + res[0].lastIndexOf(",")).trim();
     }
 
     return res;
@@ -51712,9 +51712,9 @@ function () {
     var intervalStr = BigQueryQuery._getIntervalStr(interval, this.target.timeColumn);
 
     if (alias) {
-      return q.replace(/\$__timeGroupAlias\(([\w_.]+,+[\w_]+\))/g, intervalStr);
+      return q.replace(/\$__timeGroupAlias\(([\w_.]+,+[a-zA-Z0-9_ ]+\))/g, intervalStr);
     } else {
-      return q.replace(/\$__timeGroup\(([\w_.]+,+[\w_]+\))/g, intervalStr);
+      return q.replace(/\$__timeGroup\(([\w_.]+,+[a-zA-Z0-9_ ]+\))/g, intervalStr);
     }
   };
 

dist/module.js.map

@@ -30,7 +30,7 @@ export default class BigQueryQuery {
       ? q.match(/(.*\$__timeGroupAlias\(([\w._]+,)).*?(?=\))/g)
       : q.match(/(.*\$__timeGroup\(([\w_.]+,)).*?(?=\))/g);
     if (res) {
-      res = res[0].substr(1 + res[0].lastIndexOf(","));
+      res = res[0].substr(1 + res[0].lastIndexOf(",")).trim();
     }
     return res;
   }
@@ -520,9 +520,15 @@ export default class BigQueryQuery {
       this.target.timeColumn
     );
     if (alias) {
-      return q.replace(/\$__timeGroupAlias\(([\w_.]+,+[\w_]+\))/g, intervalStr);
+      return q.replace(
+        /\$__timeGroupAlias\(([\w_.]+,+[a-zA-Z0-9_ ]+\))/g,
+        intervalStr
+      );
     } else {
-      return q.replace(/\$__timeGroup\(([\w_.]+,+[\w_]+\))/g, intervalStr);
+      return q.replace(
+        /\$__timeGroup\(([\w_.]+,+[a-zA-Z0-9_ ]+\))/g,
+        intervalStr
+      );
     }
   }
 }