SNOW-2346552: added more coverage and removed redundant code

Author: sfc-gh-fhe

src/snowflake/snowpark/_internal/type_utils.py

@@ -1490,8 +1490,6 @@ def format_day_time_interval_for_display(
     elif isinstance(cell, str):
         # Raw string that needs to be formatted (e.g., "1 01:01:01.7878")
         interval_str = cell
-    else:
-        return str(cell).replace("\n", "\\n")
 
     field_names = {
         DayTimeIntervalType.DAY: "DAY",
@@ -1557,48 +1555,26 @@ def format_seconds_with_precision(
         seconds_value: Union[float, decimal.Decimal]
     ) -> str:
         """Format seconds with full precision, preserving trailing zeros for proper padding"""
-        if isinstance(seconds_value, decimal.Decimal):
-            # Use Decimal precision formatting
-            if seconds_value == int(seconds_value):
-                return f"{int(seconds_value):02d}"
-            else:
-                # For fractional seconds, ensure proper leading zero padding
-                integer_part = int(seconds_value)
-                if integer_part < 10:
-                    # Format with leading zero for the integer part
-                    formatted = f"{seconds_value:.6f}".rstrip("0")
-                    if formatted.endswith("."):
-                        return f"{integer_part:02d}"
-                    # Replace the integer part with zero-padded version
-                    decimal_part = formatted.split(".", 1)[1]
-                    return f"{integer_part:02d}.{decimal_part}"
-                else:
-                    # For >= 10, use normal formatting
-                    formatted = f"{seconds_value:.6f}".rstrip("0")
-                    if formatted.endswith("."):
-                        return f"{integer_part}"
-                    return formatted
+        # Unified formatting logic for both Decimal and float types
+        if seconds_value == int(seconds_value):
+            return f"{int(seconds_value):02d}"
         else:
-            # Float precision formatting (original logic)
-            if seconds_value == int(seconds_value):
-                return f"{int(seconds_value):02d}"
+            # For fractional seconds, ensure proper leading zero padding
+            integer_part = int(seconds_value)
+            if integer_part < 10:
+                # Format with leading zero for the integer part
+                formatted = f"{seconds_value:.6f}".rstrip("0")
+                if formatted.endswith("."):
+                    return f"{integer_part:02d}"
+                # Replace the integer part with zero-padded version
+                decimal_part = formatted.split(".", 1)[1]
+                return f"{integer_part:02d}.{decimal_part}"
             else:
-                # For fractional seconds, ensure proper leading zero padding
-                integer_part = int(seconds_value)
-                if integer_part < 10:
-                    # Format with leading zero for the integer part
-                    formatted = f"{seconds_value:.6f}".rstrip("0")
-                    if formatted.endswith("."):
-                        return f"{integer_part:02d}"
-                    # Replace the integer part with zero-padded version
-                    decimal_part = formatted.split(".", 1)[1]
-                    return f"{integer_part:02d}.{decimal_part}"
-                else:
-                    # For >= 10, use normal formatting
-                    formatted = f"{seconds_value:.6f}".rstrip("0")
-                    if formatted.endswith("."):
-                        return f"{integer_part}"
-                    return formatted
+                # For >= 10, use normal formatting
+                formatted = f"{seconds_value:.6f}".rstrip("0")
+                if formatted.endswith("."):
+                    return f"{integer_part}"
+                return formatted
 
     # For single field intervals, extract just that component
     if start_field == end_field:

tests/integ/test_dataframe.py

@@ -3373,6 +3373,88 @@ def test_show_interval_formatting(session):
         """
     )
 
+    # === Targeted Tests to Hit Remaining Missing Lines ===
+
+    # Very large interval to trigger Decimal path with integer seconds
+    df = session.sql("SELECT INTERVAL '2000000' DAY as decimal_large_int")
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +----------------------+
+        |"DECIMAL_LARGE_INT"   |
+        +----------------------+
+        |INTERVAL '2000000' DAY|
+        +----------------------+
+        """
+    )
+
+    # Very large interval with fractional seconds < 10 to trigger Decimal path
+    df = session.sql(
+        "SELECT INTERVAL '2000000 00:00:05.123456' DAY TO SECOND as decimal_small_frac"
+    )
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +------------------------------------------------+
+        |"DECIMAL_SMALL_FRAC"                            |
+        +------------------------------------------------+
+        |INTERVAL '2000000 00:00:05.123456' DAY TO SECOND|
+        +------------------------------------------------+
+        """
+    )
+
+    # Very large interval with fractional seconds >= 10 to trigger Decimal path
+    df = session.sql(
+        "SELECT INTERVAL '2000000 00:00:15.123456' DAY TO SECOND as decimal_large_frac"
+    )
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +------------------------------------------------+
+        |"DECIMAL_LARGE_FRAC"                            |
+        +------------------------------------------------+
+        |INTERVAL '2000000 00:00:15.123456' DAY TO SECOND|
+        +------------------------------------------------+
+        """
+    )
+
+    # Normal interval with integer seconds to trigger float path
+    df = session.sql("SELECT INTERVAL '00:00:05' HOUR TO SECOND as float_int_test")
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +----------------------------------+
+        |"FLOAT_INT_TEST"                  |
+        +----------------------------------+
+        |INTERVAL '00:00:05' HOUR TO SECOND|
+        +----------------------------------+
+        """
+    )
+
+    # Normal interval with fractional seconds < 10 for float path
+    df = session.sql(
+        "SELECT INTERVAL '00:00:05.123456' HOUR TO SECOND as float_small_frac"
+    )
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +-----------------------------------------+
+        |"FLOAT_SMALL_FRAC"                       |
+        +-----------------------------------------+
+        |INTERVAL '00:00:05.123456' HOUR TO SECOND|
+        +-----------------------------------------+
+        """
+    )
+
+    # Normal interval with fractional seconds >= 10 for float path
+    df = session.sql(
+        "SELECT INTERVAL '00:00:15.123456' HOUR TO SECOND as float_large_frac"
+    )
+    assert df._show_string_spark(truncate=False) == dedent(
+        """\
+        +-----------------------------------------+
+        |"FLOAT_LARGE_FRAC"                       |
+        +-----------------------------------------+
+        |INTERVAL '00:00:15.123456' HOUR TO SECOND|
+        +-----------------------------------------+
+        """
+    )
+
 
 @pytest.mark.parametrize("data", [[0, 1, 2, 3], ["", "a"], [False, True], [None]])
 def test_create_dataframe_with_single_value(session, data):