NOSNOW: Expect ICEBERG_VERSION = 2 in tests with Iceberg get_ddl assertions

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 #### Bug Fixes
 
+- Fixed a bug where Iceberg integration tests failed because get_ddl expectations omitted ICEBERG_VERSION = 2.
+
 #### Improvements
 
 - Restored the following query improvements that were reverted in 1.47.0 due to bugs:

tests/integ/scala/test_dataframe_copy_into.py

@@ -281,7 +281,7 @@ def test_copy_into_csv_iceberg(
         ddl = session._run_query(f"select get_ddl('table', '{test_table_name}')")
         assert (
             ddl[0][0]
-            == f"create or replace ICEBERG TABLE {test_table_name} (\n\tA LONG,\n\tB STRING,\n\tC DOUBLE\n)\n PARTITION BY (B, BUCKET(10, A), TRUNCATE(3, B))\n EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n CATALOG = 'SNOWFLAKE'\n BASE_LOCATION = 'snowpark_python_tests/';"
+            == f"create or replace ICEBERG TABLE {test_table_name} (\n\tA LONG,\n\tB STRING,\n\tC DOUBLE\n)\n PARTITION BY (B, BUCKET(10, A), TRUNCATE(3, B))\n EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n ICEBERG_VERSION = 2\n CATALOG = 'SNOWFLAKE'\n BASE_LOCATION = 'snowpark_python_tests/';"
         )
         # Check that a copy_into works on the newly created table.
         df.copy_into_table(test_table_name)

tests/integ/scala/test_dataframe_writer_suite.py

@@ -299,7 +299,7 @@ def test_iceberg_partition_by(session, local_testing_mode):
             ddl[0][0] == f"create or replace ICEBERG TABLE {table_name_1} (\n\t"
             f"A STRING,\n\tB LONG\n)\n "
             f"PARTITION BY (B)\n "
-            f"EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n CATALOG = 'SNOWFLAKE';"
+            f"EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n ICEBERG_VERSION = 2\n CATALOG = 'SNOWFLAKE';"
         )
 
     finally:

tests/integ/scala/test_datatype_suite.py

@@ -560,7 +560,7 @@ def test_structured_dtypes_iceberg(
         assert save_ddl[0][0] == (
             f"create or replace ICEBERG TABLE {table_name.upper()} (\n\t"
             "MAP MAP(STRING, LONG),\n\tOBJ OBJECT(A STRING, b DOUBLE),\n\tARR ARRAY(DOUBLE)\n)\n "
-            "EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n CATALOG = 'SNOWFLAKE'\n "
+            "EXTERNAL_VOLUME = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'\n ICEBERG_VERSION = 2\n CATALOG = 'SNOWFLAKE'\n "
             "BASE_LOCATION = 'python_connector_merge_gate/';"
         )
 
@@ -588,7 +588,7 @@ def test_structured_dtypes_iceberg(
             f"create or replace dynamic iceberg table {dynamic_table_name}(\n\tMAP,\n\tOBJ,\n\tARR\n)"
             " target_lag = '16 hours, 40 minutes' refresh_mode = AUTO initialize = ON_CREATE "
             f"warehouse = {warehouse} external_volume = 'PYTHON_CONNECTOR_ICEBERG_EXVOL'  "
-            "catalog = 'SNOWFLAKE'  base_location = 'python_connector_merge_gate/' \n as  "
+            "catalog = 'SNOWFLAKE' ICEBERG_VERSION = 2 base_location = 'python_connector_merge_gate/' \n as  "
             f"SELECT  * \n FROM (\n SELECT  *  FROM {formatted_table_name}\n);"
         )