fix: timestamp_tz display (#18958)

KKould · youngsofun · web-flow · commit d99a23017c13 · 2025-11-13T15:27:03.000+08:00
* fix: timestamp_tz display

* chore: fix timestamp_tz age

* Update tests/sqllogictests/suites/query/functions/02_0002_function_cast.test

Co-authored-by: Yang Xiufeng &lt;yangxiufeng.c@gmail.com&gt;

* chore: add test for timezone_tz default tz

* chore: add test for timezone_tz default tz

---------

Co-authored-by: Yang Xiufeng &lt;yangxiufeng.c@gmail.com&gt;
diff --git a/src/common/column/src/types/native.rs b/src/common/column/src/types/native.rs
@@ -532,7 +532,7 @@ impl timestamp_tz {
 
 impl Display for timestamp_tz {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let timestamp = Timestamp::from_microsecond(self.timestamp()).unwrap();
+        let timestamp = Timestamp::from_microsecond(self.total_micros()).unwrap();
 
         let offset = tz::Offset::from_seconds(self.seconds_offset()).unwrap();
         let string = strtime::format(
diff --git a/src/query/functions/src/scalars/timestamp/src/interval.rs b/src/query/functions/src/scalars/timestamp/src/interval.rs
@@ -145,9 +145,7 @@ fn register_interval_add_sub_mul(registry: &mut FunctionRegistry) {
                             return;
                         }
                     };
-                    // EvalMonthsImpl::eval_timestamp will use tz to add offset to timestamp as local timestamp, so here we balance it by subtracting offset in advance
-                    // - input.micros_offset().unwrap_or(0)
-                    eval_timestamp_plus(a, b, output, ctx, |input| input.timestamp() - input.micros_offset().unwrap_or(0), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
+                    eval_timestamp_plus(a, b, output, ctx, |input| input.timestamp(), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
                 },
             ),
         );
@@ -185,9 +183,7 @@ fn register_interval_add_sub_mul(registry: &mut FunctionRegistry) {
                             return;
                         }
                     };
-                    // EvalMonthsImpl::eval_timestamp will use tz to add offset to timestamp as local timestamp, so here we balance it by subtracting offset in advance
-                    // - input.micros_offset().unwrap_or(0)
-                    eval_timestamp_plus(a, b, output, ctx, |input| input.timestamp() - input.micros_offset().unwrap_or(0), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
+                    eval_timestamp_plus(a, b, output, ctx, |input| input.timestamp(), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
                 },
             ),
         );
@@ -239,9 +235,7 @@ fn register_interval_add_sub_mul(registry: &mut FunctionRegistry) {
                             return;
                         }
                     };
-                    // EvalMonthsImpl::eval_timestamp will use tz to add offset to timestamp as local timestamp, so here we balance it by subtracting offset in advance
-                    // - input.micros_offset().unwrap_or(0)
-                    eval_timestamp_minus(a, b, output, ctx, |input| input.timestamp() - input.micros_offset().unwrap_or(0), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
+                    eval_timestamp_minus(a, b, output, ctx, |input| input.timestamp(), |result| timestamp_tz::new(result, a.seconds_offset()), TimeZone::fixed(offset));
                 },
             ),
         );
diff --git a/tests/sqllogictests/suites/base/03_common/03_0016_insert_into_values.test b/tests/sqllogictests/suites/base/03_common/03_0016_insert_into_values.test
@@ -71,7 +71,7 @@ insert into ts1 values (1676620596564, '2024-10-22 12:00:00+0900')
 query T
 select a, b from ts1
 ----
-2023-02-17 07:56:36.564000 2024-10-22 21:00:00.000000 +0900
+2023-02-17 07:56:36.564000 2024-10-22 12:00:00.000000 +0900
 
 statement ok
 create table my_table(column1 string, column2 string, column3 string);
diff --git a/tests/sqllogictests/suites/base/05_ddl/05_0000_ddl_create_tables.test b/tests/sqllogictests/suites/base/05_ddl/05_0000_ddl_create_tables.test
@@ -697,5 +697,5 @@ insert into test_timestamp_tz values(1, '2024-10-22 12:00:00');
 query T rowsort
 select c1, c2::STRING from test_timestamp_tz;
 ----
-0 2024-10-22 21:00:00.000000 +0900
+0 2024-10-22 12:00:00.000000 +0900
 1 2024-10-22 12:00:00.000000 +0000
diff --git a/tests/sqllogictests/suites/base/09_fuse_engine/09_0001_remote_insert.test b/tests/sqllogictests/suites/base/09_fuse_engine/09_0001_remote_insert.test
@@ -53,7 +53,7 @@ INSERT INTO t3 (a,b,c,d,e,f) values(true, '2021-09-07 21:38:35.000000', '2021-09
 query BTTTTT
 SELECT a, b, c, d, e, f FROM t3 order by a desc;
 ----
-1 2021-09-07 21:38:35.000000 2021-09-07 [1,2,3] (10,'abc') 2024-10-22 21:00:00.000000 +0900
+1 2021-09-07 21:38:35.000000 2021-09-07 [1,2,3] (10,'abc') 2024-10-22 12:00:00.000000 +0900
 0 2021-09-07 21:38:35.000000 2021-09-07 [4,5,6] (20,'xyz') 2024-10-22 12:00:00.000000 +0000
 
 query IIIT
@@ -150,7 +150,7 @@ INSERT INTO t_compression_zstd (a,b,c,e) values(true, '2021-09-07 21:38:35.00000
 query BTTT
 SELECT a, b, c, e FROM t_compression_zstd order by a desc;
 ----
-1 2021-09-07 21:38:35.000000 2021-09-07 2024-10-22 21:00:00.000000 +0900
+1 2021-09-07 21:38:35.000000 2021-09-07 2024-10-22 12:00:00.000000 +0900
 0 2021-09-07 21:38:35.000000 2021-09-07 2024-10-22 12:00:00.000000 +0000
 
 statement ok
diff --git a/tests/sqllogictests/suites/base/11_data_type/11_0001_data_type_date_time.test b/tests/sqllogictests/suites/base/11_data_type/11_0001_data_type_date_time.test
@@ -89,12 +89,12 @@ select '2044-05-06 03:25:02.868894'::TIMESTAMP_TZ
 query T
 select '2044-05-06 03:25:02.868894-0700'::TIMESTAMP_TZ::STRING
 ----
-2044-05-05 20:25:02.868894 -0700
+2044-05-06 03:25:02.868894 -0700
 
 query T
 select '2044-05-06 03:25:02.868894-07:00'::TIMESTAMP_TZ::STRING
 ----
-2044-05-05 20:25:02.868894 -0700
+2044-05-06 03:25:02.868894 -0700
 
 query T
 select '2044-05-06T03:25:02.868894'::TIMESTAMP_TZ::STRING
@@ -104,12 +104,12 @@ select '2044-05-06T03:25:02.868894'::TIMESTAMP_TZ::STRING
 query T
 select '2044-05-06T03:25:02.868894-0700'::TIMESTAMP_TZ::STRING
 ----
-2044-05-05 20:25:02.868894 -0700
+2044-05-06 03:25:02.868894 -0700
 
 query T
 select '2044-05-06T03:25:02.868894-07:00'::TIMESTAMP_TZ::STRING
 ----
-2044-05-05 20:25:02.868894 -0700
+2044-05-06 03:25:02.868894 -0700
 
 query T
 select '9999-12-12'::TIMESTAMP_TZ::STRING
diff --git a/tests/sqllogictests/suites/query/functions/02_0002_function_cast.test b/tests/sqllogictests/suites/query/functions/02_0002_function_cast.test
@@ -215,7 +215,7 @@ set timezone='Asia/Shanghai'
 query T
 select to_timestamp_tz(to_timestamp('2021-12-20 17:01:01.000000'))::STRING
 ----
-2021-12-20 17:01:01.000000 +0800
+2021-12-20 09:01:01.000000 +0800
 
 query T
 select to_timestamp(to_timestamp_tz('2021-12-20 17:01:01.000000 +0000'))
@@ -235,6 +235,26 @@ select to_timestamp(to_timestamp_tz('2021-12-20 17:01:01.000000 +0800'))
 ----
 2021-12-20 09:01:01.000000
 
+query T
+select to_timestamp_tz('2024-04-16 12:34:56.789 +0600')
+----
+2024-04-16 12:34:56.789000 +0600
+
+query T
+settings(timezone='Asia/Shanghai') select to_timestamp_tz('2024-04-16 12:34:56.789 +0600')
+----
+2024-04-16 12:34:56.789000 +0600
+
+query T
+settings(timezone='Asia/Shanghai') select to_timestamp_tz('2024-04-16 12:34:56.789 +0800')
+----
+2024-04-16 12:34:56.789000 +0800
+
+query T
+settings(timezone='Asia/Shanghai') select to_timestamp_tz('2024-04-16 12:34:56.789')
+----
+2024-04-16 12:34:56.789000 +0800
+
 query B
 SELECT to_variant(true)::boolean
 ----
