Merge pull request #76 from doitintl/issue-75

Fixes #75

Author: avivl

dist/module.js

@@ -52752,25 +52752,28 @@ function () {
   };
 
   BigQueryDatasource.prototype._updateAlias = function (q, options, shiftstr) {
-    var index = shiftstr.search(Shifted);
-    var shifted = shiftstr.substr(index, shiftstr.length);
+    if (shiftstr !== undefined) {
+      var index = shiftstr.search(Shifted);
+      var shifted = shiftstr.substr(index, shiftstr.length);
 
-    for (var _i = 0, _a = options.targets[0].select[0]; _i < _a.length; _i++) {
-      var al = _a[_i];
+      for (var _i = 0, _a = options.targets[0].select[0]; _i < _a.length; _i++) {
+        var al = _a[_i];
 
-      if (al.type === "alias") {
-        q = q.replace("AS " + al.params[0], "AS " + al.params[0] + shifted);
-        return q;
+        if (al.type === "alias") {
+          q = q.replace("AS " + al.params[0], "AS " + al.params[0] + shifted);
+          return q;
+        }
       }
+
+      var aliasshiftted = [options.targets[0].select[0][0].params[0] + shifted];
+      var oldSelect = this.queryModel.buildValueColumn(options.targets[0].select[0]);
+      var newSelect = this.queryModel.buildValueColumn([options.targets[0].select[0][0], options.targets[0].select[0][1], {
+        type: "alias",
+        params: [aliasshiftted]
+      }]);
+      q = q.replace(oldSelect, newSelect);
     }
 
-    var aliasshiftted = [options.targets[0].select[0][0].params[0] + shifted];
-    var oldSelect = this.queryModel.buildValueColumn(options.targets[0].select[0]);
-    var newSelect = this.queryModel.buildValueColumn([options.targets[0].select[0][0], options.targets[0].select[0][1], {
-      type: "alias",
-      params: [aliasshiftted]
-    }]);
-    q = q.replace(oldSelect, newSelect);
     return q;
   };
 

dist/module.js.map

@@ -569,24 +569,28 @@ export class BigQueryDatasource {
     return data;
   }
   private _updateAlias(q, options, shiftstr) {
-    const index = shiftstr.search(Shifted);
-    const shifted = shiftstr.substr(index, shiftstr.length);
-    for (const al of options.targets[0].select[0]) {
-      if (al.type === "alias") {
-        q = q.replace("AS " + al.params[0], "AS " + al.params[0] + shifted);
-        return q;
+    if (shiftstr !== undefined) {
+      const index = shiftstr.search(Shifted);
+      const shifted = shiftstr.substr(index, shiftstr.length);
+      for (const al of options.targets[0].select[0]) {
+        if (al.type === "alias") {
+          q = q.replace("AS " + al.params[0], "AS " + al.params[0] + shifted);
+          return q;
+        }
       }
+      const aliasshiftted = [
+        options.targets[0].select[0][0].params[0] + shifted
+      ];
+      const oldSelect = this.queryModel.buildValueColumn(
+        options.targets[0].select[0]
+      );
+      const newSelect = this.queryModel.buildValueColumn([
+        options.targets[0].select[0][0],
+        options.targets[0].select[0][1],
+        { type: "alias", params: [aliasshiftted] }
+      ]);
+      q = q.replace(oldSelect, newSelect);
     }
-    const aliasshiftted = [options.targets[0].select[0][0].params[0] + shifted];
-    const oldSelect = this.queryModel.buildValueColumn(
-      options.targets[0].select[0]
-    );
-    const newSelect = this.queryModel.buildValueColumn([
-      options.targets[0].select[0][0],
-      options.targets[0].select[0][1],
-      { type: "alias", params: [aliasshiftted] }
-    ]);
-    q = q.replace(oldSelect, newSelect);
     return q;
   }
 }