Changeset: 5ed00d4a3e50 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5ed00d4a3e50 Branch: default Log Message:
Merges Aug2024 branch diffs (62 lines): diff --git a/sql/test/datetime/Tests/time_to_str.test b/sql/test/datetime/Tests/time_to_str.test --- a/sql/test/datetime/Tests/time_to_str.test +++ b/sql/test/datetime/Tests/time_to_str.test @@ -3,12 +3,12 @@ create table itt (n int, t timetz, p tex statement ok insert into itt values - (1, timetz '00:00:12', '%l hour %M:%S %p'), - (2, timetz '00:01:23', '%l hour %S:%M %p'), + (1, timetz '00:00:12', '%I hour %M:%S %p'), + (2, timetz '00:01:23', '%I hour %S:%M %p'), (3, timetz '00:12:34', '%T %p') query IT rowsort -select n, time_to_str(t, '%l hour %M:%S %p') from itt +select n, time_to_str(t, '%I hour %M:%S %p') from itt ---- 1 12 hour 00:12 AM @@ -22,9 +22,9 @@ 12 hour 12:34 AM query IT rowsort select n, case when n < 2 then - time_to_str(t, '%l hour %M:%S %p') + time_to_str(t, '%I hour %M:%S %p') else - time_to_str(t, '%l hour %M:%S %p') + time_to_str(t, '%I hour %M:%S %p') end from itt ---- diff --git a/sql/test/datetime/Tests/timestamp_to_str.test b/sql/test/datetime/Tests/timestamp_to_str.test --- a/sql/test/datetime/Tests/timestamp_to_str.test +++ b/sql/test/datetime/Tests/timestamp_to_str.test @@ -3,12 +3,12 @@ create table ist (n int, s timestamptz, statement ok insert into ist values - (1, timestamptz '2024-01-01 00:00:12', '%d %b %l:%M:%S %p, %Y'), - (2, timestamptz '2024-01-01 00:01:23', '%b %d %l:%S:%M %p, %Y'), + (1, timestamptz '2024-01-01 00:00:12', '%d %b %I:%M:%S %p, %Y'), + (2, timestamptz '2024-01-01 00:01:23', '%b %d %I:%S:%M %p, %Y'), (3, timestamptz '2024-01-01 00:12:34', '%d %b %T, %Y') query IT rowsort -select n, timestamp_to_str(s, '%d %b %l:%M:%S %p, %Y') from ist +select n, timestamp_to_str(s, '%d %b %I:%M:%S %p, %Y') from ist ---- 1 01 Jan 12:00:12 AM, 2024 @@ -23,9 +23,9 @@ 01 Jan 12:12:34 AM, 2024 query IT rowsort select n, case when n < 2 then - timestamp_to_str(s, '%d %b %l:%M:%S %p, %Y') + timestamp_to_str(s, '%d %b %I:%M:%S %p, %Y') else - timestamp_to_str(s, '%d %b %l:%M:%S %p, %Y') + timestamp_to_str(s, '%d %b %I:%M:%S %p, %Y') end from ist ---- _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org