Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6fdf7be

Browse files
committed
Fixes for datetime-related regress tests, from Tom Lockhart.
1 parent53b2e00 commit6fdf7be

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎src/test/regress/expected/horology-no-DST-before-1970.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,11 @@ SELECT CAST(CAST(date 'today' + time with time zone '01:30'
548548
03:31:00
549549
(1 row)
550550

551-
SELECT CAST(CAST(date 'today' + time with time zone '03:30'
552-
+ interval '1 month 04:01'AS time with time zone) AS time) AS "07:31:00";
551+
SELECT CAST(cast(date 'today' + time with time zone '03:30-08'
552+
+ interval '1 month 04:01'as timestamp without time zone) AS time) AS "07:31:00";
553553
07:31:00
554554
----------
555-
06:31:00
555+
07:31:00
556556
(1 row)
557557

558558
SELECT interval '04:30' - time with time zone '01:02-05' AS "20:32:00-05";

‎src/test/regress/expected/horology.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ SELECT CAST(CAST(date 'today' + time with time zone '01:30'
548548
03:31:00
549549
(1 row)
550550

551-
SELECT CAST(CAST(date 'today' + time with time zone '03:30'
552-
+ interval '1 month 04:01'AS time with time zone) AS time) AS "07:31:00";
551+
SELECT CAST(cast(date 'today' + time with time zone '03:30-08'
552+
+ interval '1 month 04:01'as timestamp without time zone) AS time) AS "07:31:00";
553553
07:31:00
554554
----------
555555
07:31:00

‎src/test/regress/expected/rules.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,8 +1308,8 @@ SELECT viewname, definition FROM pg_views ORDER BY viewname;
13081308

13091309
SELECT tablename, rulename, definition FROM pg_rules
13101310
ORDER BY tablename, rulename;
1311-
tablename | rulename |definition
1312-
---------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1311+
tablename | rulename | definition
1312+
---------------+-----------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
13131313
rtest_emp | rtest_emp_del | CREATE RULE rtest_emp_del AS ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (old.ename, "current_user"(), 'fired '::bpchar, '$0.00'::money, old.salary);
13141314
rtest_emp | rtest_emp_ins | CREATE RULE rtest_emp_ins AS ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'hired '::bpchar, new.salary, '$0.00'::money);
13151315
rtest_emp | rtest_emp_upd | CREATE RULE rtest_emp_upd AS ON UPDATE TO rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'honored '::bpchar, new.salary, old.salary);
@@ -1335,7 +1335,7 @@ SELECT tablename, rulename, definition FROM pg_rules
13351335
shoelace | shoelace_del | CREATE RULE shoelace_del AS ON DELETE TO shoelace DO INSTEAD DELETE FROM shoelace_data WHERE (shoelace_data.sl_name = old.sl_name);
13361336
shoelace | shoelace_ins | CREATE RULE shoelace_ins AS ON INSERT TO shoelace DO INSTEAD INSERT INTO shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit) VALUES (new.sl_name, new.sl_avail, new.sl_color, new.sl_len, new.sl_unit);
13371337
shoelace | shoelace_upd | CREATE RULE shoelace_upd AS ON UPDATE TO shoelace DO INSTEAD UPDATE shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit WHERE (shoelace_data.sl_name = old.sl_name);
1338-
shoelace_data | log_shoelace | CREATE RULE log_shoelace AS ON UPDATE TO shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO shoelace_log (sl_name, sl_avail, log_who, log_when) VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name,'Thu Jan 01 00:00:00 1970'::"timestamp");
1338+
shoelace_data | log_shoelace | CREATE RULE log_shoelace AS ON UPDATE TO shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO shoelace_log (sl_name, sl_avail, log_who, log_when) VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name,"timestamp"('epoch'::text));
13391339
shoelace_ok | shoelace_ok_ins | CREATE RULE shoelace_ok_ins AS ON INSERT TO shoelace_ok DO INSTEAD UPDATE shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant) WHERE (shoelace.sl_name = new.ok_name);
13401340
(27 rows)
13411341

‎src/test/regress/sql/horology.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
8787
SELECT CAST(CAST(date'today'+time with time zone'01:30'
8888
+ interval'02:01'AStime with time zone)AStime)AS"03:31:00";
8989

90-
SELECT CAST(CAST(date'today'+time with time zone'03:30'
91-
+ interval'1 month 04:01'AStime with time zone)AStime)AS"07:31:00";
90+
SELECT CAST(cast(date'today'+time with time zone'03:30-08'
91+
+ interval'1 month 04:01'astimestamp without time zone)AStime)AS"07:31:00";
9292

9393
SELECT interval'04:30'-time with time zone'01:02-05'AS"20:32:00-05";
9494

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp