fix window errors

Author: chelsea-lin

bigframes/core/compile/sqlglot/aggregations/unary_compiler.py

@@ -121,7 +121,7 @@ def _(
         case_expr = _cut_ops_w_int_bins(op, column, op.bins, window)
     else:  # Interpret as intervals
         case_expr = _cut_ops_w_intervals(op, column, op.bins, window)
-    return apply_window_if_present(case_expr, window)
+    return case_expr
 
 
 def _cut_ops_w_int_bins(
@@ -165,31 +165,18 @@ def _cut_ops_w_int_bins(
                 col_min + sge.convert(this_bin + 1) * bin_width + right_adj
             )
             if op.right:
-                value = sge.Struct(
-                    expressions=[
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="left_exclusive", quoted=True),
-                            expression=left,
-                        ),
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="right_inclusive", quoted=True),
-                            expression=right,
-                        ),
-                    ]
-                )
+                left_identifier = sge.Identifier(this="left_exclusive", quoted=True)
+                right_identifier = sge.Identifier(this="right_inclusive", quoted=True)
             else:
-                value = sge.Struct(
-                    expressions=[
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="left_inclusive", quoted=True),
-                            expression=left,
-                        ),
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="right_exclusive", quoted=True),
-                            expression=right,
-                        ),
-                    ]
-                )
+                left_identifier = sge.Identifier(this="left_inclusive", quoted=True)
+                right_identifier = sge.Identifier(this="right_exclusive", quoted=True)
+
+            value = sge.Struct(
+                expressions=[
+                    sge.PropertyEQ(this=left_identifier, expression=left),
+                    sge.PropertyEQ(this=right_identifier, expression=right),
+                ]
+            )
 
         condition: sge.Expression
         if this_bin == bins - 1:
@@ -242,31 +229,18 @@ def _cut_ops_w_intervals(
             value = ir._literal(list(op.labels)[this_bin], dtypes.STRING_DTYPE)
         else:
             if op.right:
-                value = sge.Struct(
-                    expressions=[
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="left_exclusive", quoted=True),
-                            expression=left,
-                        ),
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="right_inclusive", quoted=True),
-                            expression=right,
-                        ),
-                    ]
-                )
+                left_identifier = sge.Identifier(this="left_exclusive", quoted=True)
+                right_identifier = sge.Identifier(this="right_inclusive", quoted=True)
             else:
-                value = sge.Struct(
-                    expressions=[
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="left_inclusive", quoted=True),
-                            expression=left,
-                        ),
-                        sge.PropertyEQ(
-                            this=sge.Identifier(this="right_exclusive", quoted=True),
-                            expression=right,
-                        ),
-                    ]
-                )
+                left_identifier = sge.Identifier(this="left_inclusive", quoted=True)
+                right_identifier = sge.Identifier(this="right_exclusive", quoted=True)
+
+            value = sge.Struct(
+                expressions=[
+                    sge.PropertyEQ(this=left_identifier, expression=left),
+                    sge.PropertyEQ(this=right_identifier, expression=right),
+                ]
+            )
         case_expr = case_expr.when(condition, value)
     return case_expr
 

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_cut/int_bins.sql

@@ -47,7 +47,7 @@ WITH `bfcte_0` AS (
           3 * IEEE_DIVIDE(MAX(`int64_col`) OVER () - MIN(`int64_col`) OVER (), 3)
         ) + 0 AS `right_inclusive`
       )
-    END OVER () AS `bfcol_1`
+    END AS `bfcol_1`
   FROM `bfcte_0`
 )
 SELECT

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_cut/int_bins_labels.sql

@@ -16,7 +16,7 @@ WITH `bfcte_0` AS (
       THEN 'b'
       WHEN `int64_col` IS NOT NULL
       THEN 'c'
-    END OVER () AS `bfcol_1`
+    END AS `bfcol_1`
   FROM `bfcte_0`
 )
 SELECT

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_cut/interval_bins.sql

@@ -10,7 +10,7 @@ WITH `bfcte_0` AS (
       THEN STRUCT(0 AS `left_exclusive`, 1 AS `right_inclusive`)
       WHEN `int64_col` > 1 AND `int64_col` <= 2
       THEN STRUCT(1 AS `left_exclusive`, 2 AS `right_inclusive`)
-    END OVER () AS `bfcol_1`
+    END AS `bfcol_1`
   FROM `bfcte_0`
 )
 SELECT

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_cut/interval_bins_labels.sql

@@ -10,7 +10,7 @@ WITH `bfcte_0` AS (
       THEN 0
       WHEN `int64_col` > 1 AND `int64_col` <= 2
       THEN 1
-    END OVER () AS `bfcol_1`
+    END AS `bfcol_1`
   FROM `bfcte_0`
 )
 SELECT

tests/unit/core/compile/sqlglot/aggregations/test_unary_compiler.py

@@ -199,7 +199,7 @@ def test_cut(scalar_types_df: bpd.DataFrame, snapshot):
     # Loop through the aggregation map items
     for test_name, agg_expr in agg_ops_map.items():
         sql = _apply_unary_window_op(bf_df, agg_expr, window, test_name)
-        
+
         snapshot.assert_match(sql, f"{test_name}.sql")