fix

Author: parthchandra

native/spark-expr/src/utils.rs

@@ -76,9 +76,11 @@ pub fn array_with_timezone(
             assert!(!timezone.is_empty());
             match to_type {
                 Some(DataType::Utf8) | Some(DataType::Date32) => Ok(array),
-                // Pass through for Timestamp(_, Some(_)) targets: the cast_array dispatch arm
-                // handles NTZ → TIMESTAMP conversion with correct "UTC" output annotation.
-                Some(DataType::Timestamp(_, Some(_))) => Ok(array),
+                Some(DataType::Timestamp(_, Some(target_tz))) => {
+                    // Interpret NTZ as local time in session TZ; annotate output with target TZ
+                    // so the result has the exact annotation the caller expects.
+                    timestamp_ntz_to_timestamp(array, timezone.as_str(), Some(target_tz.as_ref()))
+                }
                 Some(DataType::Timestamp(TimeUnit::Microsecond, None)) => {
                     // Convert from Timestamp(Millisecond, None) to Timestamp(Microsecond, None)
                     let millis_array = as_primitive_array::<TimestampMillisecondType>(&array);
@@ -100,9 +102,9 @@ pub fn array_with_timezone(
             assert!(!timezone.is_empty());
             match to_type {
                 Some(DataType::Utf8) | Some(DataType::Date32) => Ok(array),
-                // Pass through for Timestamp(_, Some(_)) targets: the cast_array dispatch arm
-                // handles NTZ → TIMESTAMP conversion with correct "UTC" output annotation.
-                Some(DataType::Timestamp(_, Some(_))) => Ok(array),
+                Some(DataType::Timestamp(_, Some(target_tz))) => {
+                    timestamp_ntz_to_timestamp(array, timezone.as_str(), Some(target_tz.as_ref()))
+                }
                 _ => {
                     // Not supported
                     Err(ArrowError::CastError(format!(
@@ -117,9 +119,9 @@ pub fn array_with_timezone(
             assert!(!timezone.is_empty());
             match to_type {
                 Some(DataType::Utf8) | Some(DataType::Date32) => Ok(array),
-                // Pass through for Timestamp(_, Some(_)) targets: the cast_array dispatch arm
-                // handles NTZ → TIMESTAMP conversion with correct "UTC" output annotation.
-                Some(DataType::Timestamp(_, Some(_))) => Ok(array),
+                Some(DataType::Timestamp(_, Some(target_tz))) => {
+                    timestamp_ntz_to_timestamp(array, timezone.as_str(), Some(target_tz.as_ref()))
+                }
                 _ => {
                     // Not supported
                     Err(ArrowError::CastError(format!(