fix test_sql_scalar_for_array_series

Author: chelsea-lin

bigframes/core/compile/sqlglot/sqlglot_ir.py

@@ -644,6 +644,8 @@ def _literal(value: typing.Any, dtype: dtypes.Dtype) -> sge.Expression:
             raise ValueError(f"Cannot infer SQLGlot type from None dtype: {value}")
         return sge.Null()
 
+    if value is None:
+        return _cast(sge.Null(), sqlglot_type)
     if dtypes.is_struct_like(dtype):
         items = [
             _literal(value=value[field_name], dtype=field_dtype).as_(
@@ -658,10 +660,10 @@ def _literal(value: typing.Any, dtype: dtypes.Dtype) -> sge.Expression:
             expressions=[_literal(value=v, dtype=value_type) for v in value]
         )
         return values if len(value) > 0 else _cast(values, sqlglot_type)
-    elif dtype == dtypes.JSON_DTYPE:
-        return sge.ParseJSON(this=sge.convert(str(value)))
     elif pd.isna(value):
         return _cast(sge.Null(), sqlglot_type)
+    elif dtype == dtypes.JSON_DTYPE:
+        return sge.ParseJSON(this=sge.convert(str(value)))
     elif dtype == dtypes.BYTES_DTYPE:
         return _cast(str(value), sqlglot_type)
     elif dtypes.is_time_like(dtype):

tests/unit/core/compile/sqlglot/snapshots/test_compile_readlocal/test_compile_readlocal_w_special_values/out.sql

@@ -1,23 +1,25 @@
 WITH `bfcte_0` AS (
   SELECT
     *
-  FROM UNNEST(ARRAY<STRUCT<`bfcol_0` FLOAT64, `bfcol_1` FLOAT64, `bfcol_2` FLOAT64, `bfcol_3` FLOAT64, `bfcol_4` FLOAT64, `bfcol_5` BOOLEAN, `bfcol_6` INT64>>[STRUCT(
+  FROM UNNEST(ARRAY<STRUCT<`bfcol_0` FLOAT64, `bfcol_1` FLOAT64, `bfcol_2` FLOAT64, `bfcol_3` FLOAT64, `bfcol_4` STRUCT<foo INT64>, `bfcol_5` STRUCT<foo INT64>, `bfcol_6` ARRAY<INT64>, `bfcol_7` INT64>>[STRUCT(
     CAST(NULL AS FLOAT64),
     CAST('Infinity' AS FLOAT64),
     CAST('-Infinity' AS FLOAT64),
     CAST(NULL AS FLOAT64),
-    CAST(NULL AS FLOAT64),
-    TRUE,
+    CAST(NULL AS STRUCT<foo INT64>),
+    STRUCT(CAST(NULL AS INT64) AS `foo`),
+    ARRAY<INT64>[],
     0
-  ), STRUCT(1.0, 1.0, 1.0, 1.0, 10.0, CAST(NULL AS BOOLEAN), 1), STRUCT(2.0, 2.0, 2.0, 2.0, 20.0, FALSE, 2)])
+  ), STRUCT(1.0, 1.0, 1.0, 1.0, STRUCT(1 AS `foo`), STRUCT(1 AS `foo`), [1, 2], 1), STRUCT(2.0, 2.0, 2.0, 2.0, STRUCT(2 AS `foo`), STRUCT(2 AS `foo`), [3, 4], 2)])
 )
 SELECT
   `bfcol_0` AS `col_none`,
   `bfcol_1` AS `col_inf`,
   `bfcol_2` AS `col_neginf`,
   `bfcol_3` AS `col_nan`,
-  `bfcol_4` AS `col_int_none`,
-  `bfcol_5` AS `col_bool_none`
+  `bfcol_4` AS `col_struct_none`,
+  `bfcol_5` AS `col_struct_w_none`,
+  `bfcol_6` AS `col_list_none`
 FROM `bfcte_0`
 ORDER BY
-  `bfcol_6` ASC NULLS LAST
+  `bfcol_7` ASC NULLS LAST

tests/unit/core/compile/sqlglot/test_compile_readlocal.py

@@ -70,8 +70,9 @@ def test_compile_readlocal_w_special_values(
             "col_inf": [np.inf, 1.0, 2.0],
             "col_neginf": [-np.inf, 1.0, 2.0],
             "col_nan": [np.nan, 1.0, 2.0],
-            "col_int_none": [None, 10, 20],
-            "col_bool_none": [True, None, False],
+            "col_struct_none": [None, {"foo": 1}, {"foo": 2}],
+            "col_struct_w_none": [{"foo": None}, {"foo": 1}, {"foo": 2}],
+            "col_list_none": [None, [1, 2], [3, 4]],
         }
     )
     bf_df = bpd.DataFrame(df, session=compiler_session)