Merge branch 'vbudati/SNOW-1794510-merge-decoder' into vbudati/SNOW-1830540-decoder-union-table-functions

Author: sfc-gh-vbudati

src/snowflake/snowpark/_internal/proto/ast.proto

@@ -22,6 +22,10 @@ message List_SpDataType {
   repeated SpDataType list = 1;
 }
 
+message List_SpStructField {
+  repeated SpStructField list = 1;
+}
+
 message List_String {
   repeated string list = 1;
 }
@@ -174,7 +178,7 @@ message SpStructField {
 
 // sp-type.ir:46
 message SpStructType {
-  repeated SpStructField fields = 1;
+  List_SpStructField fields = 1;
   bool structured = 2;
 }
 

tests/ast/decoder.py

@@ -2,10 +2,6 @@
 # Copyright (c) 2012-2025 Snowflake Computing Inc. All rights reserved.
 #
 
-#
-# Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.
-#
-
 import logging
 import re
 from typing import Any, Optional, Iterable, List, Union, Dict, Tuple, Callable
@@ -16,11 +12,10 @@
 
 from google.protobuf.json_format import MessageToDict
 
-from build.lib.snowflake.snowpark.functions import call_table_function
-from build.lib.snowflake.snowpark.relational_grouped_dataframe import GroupingSets
+from snowflake.snowpark.relational_grouped_dataframe import GroupingSets
 from snowflake.snowpark import Session, Column, DataFrameAnalyticsFunctions
 import snowflake.snowpark.functions
-from snowflake.snowpark.functions import udf, when, sproc
+from snowflake.snowpark.functions import udf, when, sproc, call_table_function
 from snowflake.snowpark.types import (
     DataType,
     ArrayType,
@@ -718,6 +713,9 @@ def decode_expr(self, expr: proto.Expr, **kwargs) -> Any:
                     for kv in expr.seq_map_val.kvs
                 }
 
+            case "sp_datatype_val":
+                return self.decode_data_type_expr(expr.sp_datatype_val.datatype)
+
             case "tuple_val":
                 # vs can be a list of Expr, a single Expr, or ().
                 if hasattr(expr.tuple_val, "vs"):
@@ -845,7 +843,13 @@ def decode_expr(self, expr: proto.Expr, **kwargs) -> Any:
                 return col.is_null()
 
             case "sp_column_sql_expr":
-                return expr.sp_column_sql_expr.sql
+                sql_expr = expr.sp_column_sql_expr.sql
+                # Need to explicitly specify col("*") because of the way sql_expr AST is encoded.
+                return (
+                    snowflake.snowpark.functions.col(sql_expr)
+                    if sql_expr == "*"
+                    else sql_expr
+                )
 
             case "sp_column_string_like":
                 col = self.decode_expr(expr.sp_column_string_like.col)