Merge pull request #283 from gwinchesters/fix/window-frame-exclude-clause

fix(deparser): emit EXCLUDE clause in window frame specifications

Author: pyramation

__fixtures__/generated/generated.json

@@ -896,6 +896,9 @@
   "original/upstream/window-127.sql": "SELECT a, b,\n       SUM(b) OVER(ORDER BY A ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)\nFROM (VALUES(1,1::numeric),(2,2),(3,'NaN'),(4,3),(5,4)) t(a,b)",
   "original/upstream/window-128.sql": "SELECT to_char(SUM(n::float8) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING),'999999999999999999999D9')\n  FROM (VALUES(1,1e20),(2,1)) n(i,n)",
   "original/upstream/window-129.sql": "SELECT i, b, bool_and(b) OVER w, bool_or(b) OVER w\n  FROM (VALUES (1,true), (2,true), (3,false), (4,false), (5,true)) v(i,b)\n  WINDOW w AS (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)",
+  "original/upstream/window-130.sql": "SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE CURRENT ROW)\n\tFROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v)",
+  "original/upstream/window-131.sql": "SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE GROUP)\n\tFROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v)",
+  "original/upstream/window-132.sql": "SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE TIES)\n\tFROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v)",
   "original/upstream/varchar-1.sql": "CREATE TABLE VARCHAR_TBL(f1 varchar(1))",
   "original/upstream/varchar-2.sql": "INSERT INTO VARCHAR_TBL (f1) VALUES ('a')",
   "original/upstream/varchar-3.sql": "INSERT INTO VARCHAR_TBL (f1) VALUES ('A')",

__fixtures__/kitchen-sink/original/upstream/window.sql

@@ -641,3 +641,12 @@ SELECT to_char(SUM(n::float8) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FO
 SELECT i, b, bool_and(b) OVER w, bool_or(b) OVER w
   FROM (VALUES (1,true), (2,true), (3,false), (4,false), (5,true)) v(i,b)
   WINDOW w AS (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING);
+
+SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE CURRENT ROW)
+	FROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v);
+
+SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE GROUP)
+	FROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v);
+
+SELECT COUNT(i) OVER (ORDER BY i RANGE BETWEEN 2 PRECEDING AND CURRENT ROW EXCLUDE TIES)
+	FROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v);

packages/deparser/__tests__/kitchen-sink/original-upstream-window.test.ts

@@ -132,6 +132,9 @@ it('original-upstream-window', async () => {
   "original/upstream/window-126.sql",
   "original/upstream/window-127.sql",
   "original/upstream/window-128.sql",
-  "original/upstream/window-129.sql"
+  "original/upstream/window-129.sql",
+  "original/upstream/window-130.sql",
+  "original/upstream/window-131.sql",
+  "original/upstream/window-132.sql"
 ]);
 });

packages/deparser/src/deparser.ts

@@ -3209,6 +3209,8 @@ export class Deparser implements DeparserVisitor {
     if (!node.frameOptions) return null;
 
     const frameOptions = node.frameOptions;
+    const EXCLUDE_MASK = 0x8000 | 0x10000 | 0x20000;
+    const baseFrameOptions = frameOptions & ~EXCLUDE_MASK;
     const frameParts: string[] = [];
 
     if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
@@ -3226,26 +3228,26 @@ export class Deparser implements DeparserVisitor {
     const boundsParts: string[] = [];
 
     // Handle specific frameOptions values that have known mappings
-    if (frameOptions === 789) {
+    if (baseFrameOptions === 789) {
       boundsParts.push('CURRENT ROW');
       boundsParts.push('AND UNBOUNDED FOLLOWING');
-    } else if (frameOptions === 1077) {
+    } else if (baseFrameOptions === 1077) {
       boundsParts.push('UNBOUNDED PRECEDING');
       boundsParts.push('AND CURRENT ROW');
-    } else if (frameOptions === 18453) {
+    } else if (baseFrameOptions === 18453) {
       if (node.startOffset && node.endOffset) {
         boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
         boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
       }
-    } else if (frameOptions === 1557) {
+    } else if (baseFrameOptions === 1557) {
       boundsParts.push('CURRENT ROW');
       boundsParts.push('AND CURRENT ROW');
-    } else if (frameOptions === 16917) {
+    } else if (baseFrameOptions === 16917) {
       boundsParts.push('CURRENT ROW');
       if (node.endOffset) {
         boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
       }
-    } else if (frameOptions === 1058) {
+    } else if (baseFrameOptions === 1058) {
       return null;
     } else {
       // Handle start bound - prioritize explicit offset values over bit flags
@@ -3292,6 +3294,15 @@ export class Deparser implements DeparserVisitor {
       frameParts.push(boundsParts.join(' '));
     }
 
+    // EXCLUDE clause
+    if (frameOptions & 0x8000) { // FRAMEOPTION_EXCLUDE_CURRENT_ROW
+      frameParts.push('EXCLUDE CURRENT ROW');
+    } else if (frameOptions & 0x10000) { // FRAMEOPTION_EXCLUDE_GROUP
+      frameParts.push('EXCLUDE GROUP');
+    } else if (frameOptions & 0x20000) { // FRAMEOPTION_EXCLUDE_TIES
+      frameParts.push('EXCLUDE TIES');
+    }
+
     return frameParts.join(' ');
   }