SNOW-2272863: updated datatype mapper

Author: sfc-gh-fhe

src/snowflake/snowpark/_internal/analyzer/datatype_mapper.py

@@ -94,7 +94,7 @@ def str_to_sql_for_year_month_interval(
 
 def str_to_sql_for_day_time_interval(value: str, datatype: DayTimeIntervalType) -> str:
     """
-    Converts "INTERVAL DD HH:MM:SS.ffffff [DAY TO SECOND | DAY | HOUR | MINUTE | SECOND]" to quoted format:
+    Converts "INTERVAL DD HH:MM:SS.ffffff [DAY | HOUR | MINUTE | SECOND (TO) (DAY | HOUR | MINUTE | SECOND)]" to quoted format:
     - Same start/end field: extracts specific value (DAY, HOUR, MINUTE, or SECOND only)
     - Different fields: uses full range format (e.g., "DAY TO SECOND", "HOUR TO MINUTE")
     - Supports passthrough for already-quoted intervals
@@ -114,12 +114,53 @@ def str_to_sql_for_day_time_interval(value: str, datatype: DayTimeIntervalType)
     if len(parts[1]) > 1 and parts[1].startswith("'") and parts[1].endswith("'"):
         return value  # passthrough
 
-    start_field = datatype.start_field if datatype.start_field is not None else 0
-    end_field = datatype.end_field if datatype.end_field is not None else 1
+    start_field = (
+        datatype.start_field
+        if datatype.start_field is not None
+        else DayTimeIntervalType.DAY
+    )
+    end_field = (
+        datatype.end_field
+        if datatype.end_field is not None
+        else DayTimeIntervalType.SECOND
+    )
     if datatype.start_field == datatype.end_field:
         # When the start_field equals the end_field, it implies our DayTimeIntervalType is only
         # using a single field. This can be 1 of 4 choices. DAY for 0, HOUR for 1, MINUTE for 2, and SECOND for 3.
-        extracted_value = parts[1]
+        # We need to handle two cases:
+        # 1. Simple format: "INTERVAL 23 HOUR" - parts[1] contains the value directly
+        # 2. Complex format: "INTERVAL 1 01:01:01.7878 DAY TO SECOND" - need to parse the components
+
+        # Check if this is a simple format (e.g., "INTERVAL 23 HOUR")
+        if len(parts) >= 3 and parts[2].upper() in ["DAY", "HOUR", "MINUTE", "SECOND"]:
+            # Simple format: just use the value directly
+            extracted_value = parts[1]
+        elif len(parts) >= 3 and ":" in parts[2]:
+            if datatype.start_field == 0:
+                extracted_value = parts[1]
+            else:
+                time_part = parts[2]
+                time_components = time_part.split(":")
+                if datatype.start_field == 1:
+                    extracted_value = time_components[0]
+                elif datatype.start_field == 2:
+                    extracted_value = (
+                        time_components[1] if len(time_components) > 1 else "0"
+                    )
+                elif datatype.start_field == 3:
+                    if len(time_components) > 2:
+                        seconds_part = time_components[2]
+                        if "." in seconds_part:
+                            _, fractional = seconds_part.split(".", 1)
+                            extracted_value = fractional
+                        else:
+                            extracted_value = seconds_part
+                    else:
+                        extracted_value = "0"
+                else:
+                    extracted_value = parts[1]
+        else:
+            extracted_value = parts[1]
         return (
             f"INTERVAL '{extracted_value}' {datatype._FIELD_NAMES[start_field].upper()}"
         )

src/snowflake/snowpark/_internal/type_utils.py

@@ -1080,8 +1080,10 @@ def get_data_type_string_object_mappings(
 )
 DATA_TYPE_STRING_OBJECT_MAPPINGS["interval_year_to_month"] = YearMonthIntervalType
 DATA_TYPE_STRING_OBJECT_MAPPINGS["intervalyeartomonth"] = YearMonthIntervalType
+DATA_TYPE_STRING_OBJECT_MAPPINGS["interval_year_month"] = DayTimeIntervalType
 DATA_TYPE_STRING_OBJECT_MAPPINGS["interval_day_to_second"] = DayTimeIntervalType
 DATA_TYPE_STRING_OBJECT_MAPPINGS["intervaldaytosecond"] = DayTimeIntervalType
+DATA_TYPE_STRING_OBJECT_MAPPINGS["interval_day_time"] = DayTimeIntervalType
 DATA_TYPE_STRING_OBJECT_MAPPINGS["str"] = StringType
 DATA_TYPE_STRING_OBJECT_MAPPINGS["varchar"] = StringType
 

src/snowflake/snowpark/functions.py

@@ -10915,7 +10915,7 @@ def make_interval(
 
 @private_preview(
     version="1.38.0",
-    extra_doc_string="Type YearMonthIntervalType is currently in private preview and needs to be enabled by setting parameter `FEATURE_INTERVAL_TYPES` to `ENABLED` and `ENABLE_INTERVAL_SUBTYPES` to `TRUE`.",
+    extra_doc_string="Type YearMonthIntervalType is currently in private preview and needs to be enabled by setting parameter `FEATURE_INTERVAL_TYPES` to `ENABLED`",
 )
 @publicapi
 def interval_year_month_from_parts(
@@ -10941,7 +10941,6 @@ def interval_year_month_from_parts(
         >>> from snowflake.snowpark.functions import interval_year_month_from_parts
         >>>
         >>> _ = session.sql("ALTER SESSION SET FEATURE_INTERVAL_TYPES=ENABLED;").collect()
-        >>> _ = session.sql("ALTER SESSION SET ENABLE_INTERVAL_SUBTYPES=TRUE;").collect()
         >>> df = session.create_dataframe([[1, 2]], ["years", "months"])
         >>> df.select(interval_year_month_from_parts(col("years"), col("months")).alias("interval")).show()
         --------------

src/snowflake/snowpark/types.py

@@ -248,7 +248,7 @@ class YearMonthIntervalType(_AnsiIntervalType):
         end_field: The end field of the interval (0=YEAR, 1=MONTH)
 
     Notes:
-        YearMonthIntervalType is currently in private preview since 1.38.0. It needs to be enabled by setting parameter `FEATURE_INTERVAL_TYPES` to `ENABLED` and `ENABLE_INTERVAL_SUBTYPES` to `TRUE`.
+        YearMonthIntervalType is currently in private preview since 1.38.0. It needs to be enabled by setting parameter `FEATURE_INTERVAL_TYPES` to `ENABLED`.
 
         YearMonthIntervalType is currently not supported in UDFs and Stored Procedures.
     """
@@ -309,7 +309,7 @@ class DayTimeIntervalType(_AnsiIntervalType):
         end_field: The end field of the interval (0=DAY, 1=HOUR, 2=MINUTE, 3=SECOND)
 
     Notes:
-        DayTimeIntervalType is currently in private preview since 1.38.0. It needs to be enabled by setting parameters `FEATURE_INTERVAL_TYPES` to `ENABLED` and `ENABLE_INTERVAL_SUBTYPES` to `TRUE`.
+        DayTimeIntervalType is currently in private preview since 1.38.0. It needs to be enabled by setting parameters `FEATURE_INTERVAL_TYPES` to `ENABLED`.
 
         DayTimeIntervalType is currently not supported in UDFs and Stored Procedures.
     """

tests/integ/conftest.py

@@ -274,7 +274,7 @@ def session(
         .config("local_testing", local_testing_mode)
         .config(
             "session_parameters",
-            {"feature_interval_types": "ENABLED", "enable_interval_subtypes": "true"},
+            {"feature_interval_types": "ENABLED"},
         )
         .create()
     )

tests/unit/test_datatype_mapper.py

@@ -233,6 +233,30 @@ def test_to_sql():
         to_sql("INTERVAL 125.750 SECOND", DayTimeIntervalType(3))
         == "INTERVAL '125.750' SECOND :: INTERVAL SECOND"
     )
+    assert (
+        to_sql("INTERVAL 1 01:01:01.7878 DAY TO SECOND", DayTimeIntervalType(3))
+        == "INTERVAL '7878' SECOND :: INTERVAL SECOND"
+    )
+    assert (
+        to_sql("INTERVAL 5 12:30:45 DAY TO SECOND", DayTimeIntervalType(0))
+        == "INTERVAL '5' DAY :: INTERVAL DAY"
+    )
+    assert (
+        to_sql("INTERVAL 3 08:45:30 DAY TO SECOND", DayTimeIntervalType(1))
+        == "INTERVAL '08' HOUR :: INTERVAL HOUR"
+    )
+    assert (
+        to_sql("INTERVAL 2 14:37:22 DAY TO SECOND", DayTimeIntervalType(2))
+        == "INTERVAL '37' MINUTE :: INTERVAL MINUTE"
+    )
+    assert (
+        to_sql("INTERVAL 1 05:20:15.123456 DAY TO SECOND", DayTimeIntervalType(3))
+        == "INTERVAL '123456' SECOND :: INTERVAL SECOND"
+    )
+    assert (
+        to_sql("INTERVAL 4 16:42:58 DAY TO SECOND", DayTimeIntervalType(3))
+        == "INTERVAL '58' SECOND :: INTERVAL SECOND"
+    )
 
 
 def test_to_sql_system_function():
@@ -405,6 +429,32 @@ def test_to_sql_system_function():
         to_sql_no_cast("INTERVAL 125.750 SECOND", DayTimeIntervalType(3))
         == "INTERVAL '125.750' SECOND"
     )
+    assert (
+        to_sql_no_cast("INTERVAL 1 01:01:01.7878 DAY TO SECOND", DayTimeIntervalType(3))
+        == "INTERVAL '7878' SECOND"
+    )
+    assert (
+        to_sql_no_cast("INTERVAL 5 12:30:45 DAY TO SECOND", DayTimeIntervalType(0))
+        == "INTERVAL '5' DAY"
+    )
+    assert (
+        to_sql_no_cast("INTERVAL 3 08:45:30 DAY TO SECOND", DayTimeIntervalType(1))
+        == "INTERVAL '08' HOUR"
+    )
+    assert (
+        to_sql_no_cast("INTERVAL 2 14:37:22 DAY TO SECOND", DayTimeIntervalType(2))
+        == "INTERVAL '37' MINUTE"
+    )
+    assert (
+        to_sql_no_cast(
+            "INTERVAL 1 05:20:15.123456 DAY TO SECOND", DayTimeIntervalType(3)
+        )
+        == "INTERVAL '123456' SECOND"
+    )
+    assert (
+        to_sql_no_cast("INTERVAL 4 16:42:58 DAY TO SECOND", DayTimeIntervalType(3))
+        == "INTERVAL '58' SECOND"
+    )
 
 
 def test_generate_call_python_sp_sql():