amend selection compilation

Author: TrevorBergeron

bigframes/core/compile/sqlglot/sqlglot_ir.py

@@ -166,10 +166,7 @@ def select(
         limit: typing.Optional[int] = None,
     ) -> SQLGlotIR:
         # TODO: Explicitly insert CTEs into plan
-        if isinstance(self.expr, sge.Select):
-            new_expr = self._as_from_item()
-        else:
-            new_expr = sge.Select().from_(self.expr)
+        new_expr = sge.Select().from_(self._as_from_item())
 
         if len(sorting) > 0:
             new_expr = new_expr.order_by(*sorting)

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_binary_compiler/test_corr/out.sql

@@ -1,5 +1,7 @@
-(
+SELECT
+  `bfcol_2` AS `corr_col`
+FROM (
   SELECT
-    `bfcol_2` AS `corr_col`
+    CORR(`int64_col`, `float64_col`) AS `bfcol_2`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_binary_compiler/test_cov/out.sql

@@ -1,5 +1,7 @@
-(
+SELECT
+  `bfcol_2` AS `cov_col`
+FROM (
   SELECT
-    `bfcol_2` AS `cov_col`
+    COVAR_SAMP(`int64_col`, `float64_col`) AS `bfcol_2`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_nullary_compiler/test_size/out.sql

@@ -1,5 +1,7 @@
-(
+SELECT
+  `bfcol_32` AS `size`
+FROM (
   SELECT
-    `bfcol_32` AS `size`
+    COUNT(1) AS `bfcol_32`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_ordered_unary_compiler/test_array_agg/out.sql

@@ -1,5 +1,7 @@
-(
+SELECT
+  `bfcol_1` AS `int64_col`
+FROM (
   SELECT
-    `bfcol_1` AS `int64_col`
+    ARRAY_AGG(`int64_col` IGNORE NULLS ORDER BY `int64_col` IS NULL ASC, `int64_col` ASC) AS `bfcol_1`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_ordered_unary_compiler/test_string_agg/out.sql

@@ -1,5 +1,13 @@
-(
+SELECT
+  `bfcol_1` AS `string_col`
+FROM (
   SELECT
-    `bfcol_1` AS `string_col`
+    COALESCE(
+      STRING_AGG(`string_col`, ','
+      ORDER BY
+        `string_col` IS NULL ASC,
+        `string_col` ASC),
+      ''
+    ) AS `bfcol_1`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_all/out.sql

@@ -1,6 +1,9 @@
-(
+SELECT
+  `bfcol_2` AS `bool_col`,
+  `bfcol_3` AS `int64_col`
+FROM (
   SELECT
-    `bfcol_2` AS `bool_col`,
-    `bfcol_3` AS `int64_col`
+    COALESCE(LOGICAL_AND(`bool_col`), TRUE) AS `bfcol_2`,
+    COALESCE(LOGICAL_AND(`int64_col` <> 0), TRUE) AS `bfcol_3`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_any/out.sql

@@ -1,6 +1,9 @@
-(
+SELECT
+  `bfcol_2` AS `bool_col`,
+  `bfcol_3` AS `int64_col`
+FROM (
   SELECT
-    `bfcol_2` AS `bool_col`,
-    `bfcol_3` AS `int64_col`
+    COALESCE(LOGICAL_OR(`bool_col`), FALSE) AS `bfcol_2`,
+    COALESCE(LOGICAL_OR(`int64_col` <> 0), FALSE) AS `bfcol_3`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_any_value/out.sql

@@ -1,5 +1,7 @@
-(
+SELECT
+  `bfcol_1` AS `int64_col`
+FROM (
   SELECT
-    `bfcol_1` AS `int64_col`
+    ANY_VALUE(`int64_col`) AS `bfcol_1`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_approx_quartiles/out.sql

@@ -1,7 +1,11 @@
-(
+SELECT
+  `bfcol_1` AS `q1`,
+  `bfcol_2` AS `q2`,
+  `bfcol_3` AS `q3`
+FROM (
   SELECT
-    `bfcol_1` AS `q1`,
-    `bfcol_2` AS `q2`,
-    `bfcol_3` AS `q3`
+    APPROX_QUANTILES(`int64_col`, 4)[OFFSET(1)] AS `bfcol_1`,
+    APPROX_QUANTILES(`int64_col`, 4)[OFFSET(2)] AS `bfcol_2`,
+    APPROX_QUANTILES(`int64_col`, 4)[OFFSET(3)] AS `bfcol_3`
   FROM `bigframes-dev`.`sqlglot_test`.`scalar_types` AS `bft_0`
 )