snowpark-connect 0.31.0__py3-none-any.whl → 0.33.0__py3-none-any.whl

snowflake/snowpark_connect/expression/map_unresolved_star.py

@@ -11,6 +11,7 @@ from snowflake.snowpark._internal.analyzer.analyzer_utils import (
 )
 from snowflake.snowpark.types import StructType
 from snowflake.snowpark_connect.column_name_handler import ColumnNameMap
+from snowflake.snowpark_connect.column_qualifier import ColumnQualifier
 from snowflake.snowpark_connect.error.error_codes import ErrorCodes
 from snowflake.snowpark_connect.error.error_utils import attach_custom_error_code
 from snowflake.snowpark_connect.expression.typer import ExpressionTyper
@@ -28,7 +29,7 @@ def check_struct_and_get_field_datatype(field_name, schema):
         else:
             return None
     else:
-        None
+        return None
 
 
 def map_unresolved_star(
@@ -55,16 +56,17 @@ def map_unresolved_star(
             return spark_names, typed_column
 
         # scenario where it is expanding * to mulitple columns
-        spark_names = []
-        snowpark_names = []
-        qualifiers = []
+        spark_names: list[str] = []
+        snowpark_names: list[str] = []
+        qualifiers: list[set[ColumnQualifier]] = []
 
+        target_qualifier = ColumnQualifier(tuple(name_parts[:-1]))
         (
             spark_names,
             snowpark_names,
             qualifiers,
         ) = column_mapping.get_spark_and_snowpark_columns_with_qualifier_for_qualifier(
-            name_parts[:-1]
+            target_qualifier
         )
 
         if len(spark_names) == 0:
@@ -75,7 +77,7 @@ def map_unresolved_star(
                     snowpark_names,
                     qualifiers,
                 ) = column_mapping_for_outer_df.get_spark_and_snowpark_columns_with_qualifier_for_qualifier(
-                    name_parts[:-1]
+                    target_qualifier
                 )
                 if len(spark_names) > 0:
                     break
@@ -141,7 +143,7 @@ def map_unresolved_star(
                     final_sql_expr,
                     lambda final_sql_expr=final_sql_expr: typer.type(final_sql_expr),
                 )
-                typed_column.set_multi_col_qualifiers([[] for _ in spark_names])
+                typed_column.set_multi_col_qualifiers([set() for _ in spark_names])
                 return spark_names, typed_column
     else:
         result_exp = snowpark_fn.sql_expr(

snowflake/snowpark_connect/includes/python/pyspark/pandas/spark/__init__.py

@@ -0,0 +1,16 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#