NO-SNOW: Fix sql simplifier disabled tests (#3448)

Author: sfc-gh-aalam

src/snowflake/snowpark/dataframe.py

@@ -1678,11 +1678,13 @@ def select(
                 left_cols = string_col_names
             else:
                 left_cols = ["*"]
-            join_plan = TableFunctionJoin(
-                self._plan,
-                func_expr,
-                left_cols=left_cols,
-                right_cols=table_func_col_names,
+            join_plan = self._session._analyzer.resolve(
+                TableFunctionJoin(
+                    self._plan,
+                    func_expr,
+                    left_cols=left_cols,
+                    right_cols=table_func_col_names,
+                )
             )
 
         # AST.

tests/integ/compiler/test_query_generator.py

@@ -245,9 +245,10 @@ def test_table_create_from_large_query_breakdown(session, plan_source_generator)
     assert len(queries[PlanQueryType.QUERIES]) == 1
     assert len(queries[PlanQueryType.POST_ACTIONS]) == 0
 
-    assert (
-        Utils.normalize_sql(queries[PlanQueryType.QUERIES][0].sql)
-        == f"CREATE SCOPED TEMPORARY TABLE {table_name} AS SELECT * FROM ( select 1 as a, 2 as b )"
+    assert Utils.normalize_sql(
+        queries[PlanQueryType.QUERIES][0].sql
+    ) == Utils.normalize_sql(
+        f"CREATE SCOPED TEMPORARY TABLE {table_name} AS SELECT * FROM ( select 1 as a, 2 as b )"
     )
 
 

tests/integ/scala/test_snowflake_plan_suite.py

@@ -314,30 +314,29 @@ def test_create_scoped_temp_table(session):
             if session._sql_simplifier_enabled
             else f" SELECT * FROM ({table_name})"
         )
-        assert (
-            Utils.normalize_sql(
-                session._plan_builder.save_as_table(
-                    table_name=[temp_table_name],
-                    column_names=None,
-                    mode=SaveMode.ERROR_IF_EXISTS,
-                    table_type="temp",
-                    clustering_keys=None,
-                    comment=None,
-                    enable_schema_evolution=None,
-                    data_retention_time=None,
-                    max_data_extension_time=None,
-                    change_tracking=None,
-                    copy_grants=False,
-                    child=df._plan,
-                    source_plan=None,
-                    use_scoped_temp_objects=False,
-                    creation_source=TableCreationSource.LARGE_QUERY_BREAKDOWN,
-                    child_attributes=None,
-                )
-                .queries[0]
-                .sql
+        assert Utils.normalize_sql(
+            session._plan_builder.save_as_table(
+                table_name=[temp_table_name],
+                column_names=None,
+                mode=SaveMode.ERROR_IF_EXISTS,
+                table_type="temp",
+                clustering_keys=None,
+                comment=None,
+                enable_schema_evolution=None,
+                data_retention_time=None,
+                max_data_extension_time=None,
+                change_tracking=None,
+                copy_grants=False,
+                child=df._plan,
+                source_plan=None,
+                use_scoped_temp_objects=False,
+                creation_source=TableCreationSource.LARGE_QUERY_BREAKDOWN,
+                child_attributes=None,
             )
-            == f"CREATE TEMPORARY TABLE {temp_table_name} AS SELECT * FROM ({inner_select_sql} )"
+            .queries[0]
+            .sql
+        ) == Utils.normalize_sql(
+            f"CREATE TEMPORARY TABLE {temp_table_name} AS SELECT * FROM ({inner_select_sql} )"
         )
         expected_sql = f' CREATE  TEMPORARY  TABLE  {temp_table_name}("NUM" BIGINT, "STR" STRING(8))'
         assert expected_sql in (

tests/integ/test_dataframe.py

@@ -3376,6 +3376,9 @@ def test_append_existing_table(session, local_testing_mode):
     reason="This test failed because of parameters setting, skip for now",
 )
 def test_dynamic_table_join_table_function(session):
+    if not session.sql_simplifier_enabled:
+        pytest.skip("The fix only works with SQL Simplifier enabled currently")
+
     class TestVolumeModels:
         def process(self, s1: str, s2: float):
             yield (1,)
@@ -3458,6 +3461,9 @@ def process(self, s1: str, s2: float):
     reason="This test failed because of parameters setting, skip for now",
 )
 def test_dynamic_table_join_table_function_with_more_layers(session):
+    if not session.sql_simplifier_enabled:
+        pytest.skip("The fix only works with SQL Simplifier enabled currently")
+
     class TestVolumeModels:
         def process(self, s1: str, s2: float):
             yield (1,)
@@ -3542,6 +3548,9 @@ def process(self, s1: str, s2: float):
     reason="This test failed because of parameters setting, skip for now",
 )
 def test_dynamic_table_join_table_function_nested(session):
+    if not session.sql_simplifier_enabled:
+        pytest.skip("The fix only works with SQL Simplifier enabled currently")
+
     class TestVolumeModels:
         def process(self, s1: str, s2: float):
             yield (1,)