SNOW-2397758: Add parameter for aliasing interval function names (#3859)

Author: sfc-gh-fhe

CHANGELOG.md

@@ -58,7 +58,7 @@
     - `st_geometryfromwkt`
     - `try_to_geography`
     - `try_to_geometry`
-
+- Added a parameter to enable and disable automatic column name aliasing for `interval_day_time_from_parts` and `interval_year_month_from_parts` functions.
 
 #### Bug Fixes
 

src/snowflake/snowpark/functions.py

@@ -11031,6 +11031,7 @@ def make_interval(
 def interval_year_month_from_parts(
     years: Optional[ColumnOrName] = None,
     months: Optional[ColumnOrName] = None,
+    _alias_column_name: Optional[bool] = True,
     _emit_ast: bool = True,
 ) -> Column:
     """
@@ -11042,6 +11043,7 @@ def interval_year_month_from_parts(
     Args:
         years: The number of years, positive or negative
         months: The number of months, positive or negative
+        _alias_column_name: If true, alias the column name to a cleaner value
 
     Returns:
         A Column representing a year-month interval
@@ -11091,15 +11093,21 @@ def interval_year_month_from_parts(
     )
     interval_string = concat(sign_prefix, normalized_years, lit("-"), normalized_months)
 
-    def get_col_name(col):
-        if isinstance(col._expr1, Literal):
-            return str(col._expr1.value)
-        else:
-            return col._expression.name
+    res = cast(interval_string, "INTERVAL YEAR TO MONTH")
+    if _alias_column_name:
+        # Aliasing column names when using this in a case when will throw an error. This allows us to only alias
+        # when necessary.
+
+        def get_col_name(col):
+            if isinstance(col._expr1, Literal):
+                return str(col._expr1.value)
+            else:
+                return col._expression.name
+
+        alias_name = f"interval_year_month_from_parts({get_col_name(years_col)}, {get_col_name(months_col)})"
 
-    alias_name = f"interval_year_month_from_parts({get_col_name(years_col)}, {get_col_name(months_col)})"
+        res = res.alias(alias_name)
 
-    res = cast(interval_string, "INTERVAL YEAR TO MONTH").alias(alias_name)
     res._ast = ast
     return res
 
@@ -11114,6 +11122,7 @@ def interval_day_time_from_parts(
     hours: Optional[ColumnOrName] = None,
     mins: Optional[ColumnOrName] = None,
     secs: Optional[ColumnOrName] = None,
+    _alias_column_name: Optional[bool] = True,
     _emit_ast: bool = True,
 ) -> Column:
     """
@@ -11127,6 +11136,7 @@ def interval_day_time_from_parts(
         hours: The number of hours, positive or negative
         mins: The number of minutes, positive or negative
         secs: The number of seconds, positive or negative
+        _alias_column_name: If true, alias the column name to a cleaner value
 
     Returns:
         A Column representing a day-time interval
@@ -11238,15 +11248,21 @@ def interval_day_time_from_parts(
         secs_formatted,
     )
 
-    def get_col_name(col):
-        if isinstance(col._expr1, Literal):
-            return str(col._expr1.value)
-        else:
-            return str(col._expr1)
+    res = cast(interval_value, "INTERVAL DAY TO SECOND")
+    if _alias_column_name:
+        # Aliasing column names when using this in a case when will throw an error. This allows us to only alias
+        # when necessary.
+
+        def get_col_name(col):
+            if isinstance(col._expr1, Literal):
+                return str(col._expr1.value)
+            else:
+                return str(col._expr1)
+
+        alias_name = f"interval_day_time_from_parts({get_col_name(days_col)}, {get_col_name(hours_col)}, {get_col_name(mins_col)}, {get_col_name(secs_col)})"
 
-    alias_name = f"interval_day_time_from_parts({get_col_name(days_col)}, {get_col_name(hours_col)}, {get_col_name(mins_col)}, {get_col_name(secs_col)})"
+        res = res.alias(alias_name)
 
-    res = cast(interval_value, "INTERVAL DAY TO SECOND").alias(alias_name)
     res._ast = ast
     return res
 

tests/integ/scala/test_function_suite.py

@@ -5727,6 +5727,21 @@ def test_interval_year_month_from_parts(session):
     assert result_nulls[1]['interval_year_month_from_parts("YEARS", "MONTHS")'] is None
     assert result_nulls[2]['interval_year_month_from_parts("YEARS", "MONTHS")'] is None
 
+    df_literals = session.create_dataframe([(1,)], schema=["dummy"])
+    literals_schema_result_no_alias = df_literals.select(
+        interval_year_month_from_parts(lit(2), lit(5), _alias_column_name=False),
+    )
+    for field in literals_schema_result_no_alias.schema.fields:
+        assert field.datatype == YearMonthIntervalType(0, 1)
+
+    result_literals_no_alias = literals_schema_result_no_alias.collect()
+    assert (
+        result_literals_no_alias[0][
+            "CAST (CONCAT(IFF((((2 * 12) + 5) < 0), '-', ''),  CAST ( CAST (FLOOR((ABS(((2 * 12) + 5)) / 12)) AS INT) AS STRING), '-',  CAST ( CAST (FLOOR((ABS(((2 * 12) + 5)) % 12)) AS INT) AS STRING)) AS INTERVAL YEAR TO MONTH)"
+        ]
+        == "+2-05"
+    )
+
 
 @pytest.mark.skipif(
     "config.getoption('local_testing_mode', default=False)",
@@ -5944,3 +5959,14 @@ def test_interval_day_time_from_parts(session):
     interval_result = result_microsecond[0]["MICROSECOND_TEST"]
     expected = timedelta(seconds=0.123456)
     assert interval_result == expected
+
+    df_literals = session.create_dataframe([(1,)], schema=["dummy"])
+    literals_schema_result_no_alias = df_literals.select(
+        interval_day_time_from_parts(
+            lit(1), lit(2), lit(3), lit(4.5), _alias_column_name=False
+        ),
+    )
+    literals_result_no_alias = literals_schema_result_no_alias.collect()
+    assert literals_result_no_alias[0][
+        "CAST (CONCAT(IFF((((((1 * 86400) + (2 * 3600)) + (3 * 60)) + 4.5) < 0), '-', ''),  CAST ( CAST (FLOOR((ABS(((((1 * 86400) + (2 * 3600)) + (3 * 60)) + 4.5)) / 86400)) AS INT) AS STRING), ' ', IFF(( CAST (FLOOR(((ABS(((((1 * 86400) + (2 * 3600)) + (3 * 60))"
+    ] == timedelta(days=1, hours=2, minutes=3, seconds=4.5)