Merge pull request #267 from doitintl/feature/lior/repeatedField

Handle repeated field at window function

Author: Tamir Klein

dist/module.js

@@ -594,8 +594,14 @@ export default class BigQueryQuery {
         query = query + " " + orderBy;
       }
     }
-    if (this.isWindow) {
-      query = "\nSELECT *  EXCEPT (" + this.tmpValue + ") From \n (" + query;
+    else {
+      const DELIMITER = '.';
+      let starFields = "*", parent, child = this.tmpValue;
+      if(this.tmpValue.includes(DELIMITER)){
+        [parent, child] = this.tmpValue.split(DELIMITER);
+        starFields += `, ${parent}.*`;
+      }
+      query = "\nSELECT " + starFields + " EXCEPT (" + child + ") From \n (" + query;
       query = query + " " + this.groupBy;
     }
 

dist/module.js.map

@@ -229,6 +229,26 @@ describe("BigQueryQuery", () => {
     expect(query.buildQuery()).toBe(result);
   });
 
+  describe("Window function with except and repeated field", () => {
+    const target = {
+      select: [[{ type: "column", params: ["value"] }]],
+      table: "table",
+      timeColumn: "t",
+      where: [],
+    };
+    const query = new BigQueryQuery(target, templateSrv);
+    query.tmpValue = "t.l";
+    query.isWindow = true;
+    const result = "#standardSQL\nSELECT *, t.* EXCEPT (l) From \n" +
+      " (\n" +
+      "SELECT\n" +
+      " `t` AS time,\n" +
+      "  `value`\n" +
+      "FROM `undefined.undefined.table`)\n" +
+      "GROUP BY 1,2 ";
+    expect(query.buildQuery()).toBe(result);
+  });
+
   describe("escapeLiteral", () => {
     const res = BigQueryQuery.escapeLiteral("'a");
     expect(BigQueryQuery.escapeLiteral("'a")).toBe("''a");