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

Commit5e60041

Browse files
committed
Now that new psql is fflush()'ing properly, it emerges that several
regress test expected outputs were committed with NOTICEs appearing outof order. Update to correct results.
1 parent6ce5e0a commit5e60041

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ ERROR: renameatt: attribute "oid" exists
9292
-- TRANSACTION STUFF
9393

9494
-- not in a xact
95-
NOTICE: UserAbortTransactionBlock and not in in-progress state
9695
abort;
96+
NOTICE: UserAbortTransactionBlock and not in in-progress state
9797
-- not in a xact
98-
NOTICE: EndTransactionBlock and not inprogress/abort state
9998
end;
99+
NOTICE: EndTransactionBlock and not inprogress/abort state
100100
--
101101
-- DEFINE AGGREGATE
102102

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ DROP TABLE TEMP_DATETIME;
572572
-- formats
573573
--
574574
SET DateStyle TO 'US,Postgres';
575-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
576575
SHOW DateStyle;
576+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
577577
SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL;
578578
sixty_two | us_postgres
579579
-----------+---------------------------------
@@ -734,8 +734,8 @@ SELECT '' AS eight, f1 AS us_iso FROM ABSTIME_TBL;
734734
(8 rows)
735735

736736
SET DateStyle TO 'US,SQL';
737-
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
738737
SHOW DateStyle;
738+
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
739739
SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL;
740740
sixty_two | us_sql
741741
-----------+----------------------------
@@ -816,8 +816,8 @@ SELECT '' AS eight, f1 AS us_sql FROM ABSTIME_TBL;
816816
(8 rows)
817817

818818
SET DateStyle TO 'European,Postgres';
819-
NOTICE: DateStyle is Postgres with European conventions
820819
SHOW DateStyle;
820+
NOTICE: DateStyle is Postgres with European conventions
821821
INSERT INTO DATETIME_TBL VALUES('13/06/1957');
822822
SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957';
823823
one
@@ -906,8 +906,8 @@ SELECT '' AS eight, f1 AS european_postgres FROM ABSTIME_TBL;
906906
(8 rows)
907907

908908
SET DateStyle TO 'European,ISO';
909-
NOTICE: DateStyle is ISO with European conventions
910909
SHOW DateStyle;
910+
NOTICE: DateStyle is ISO with European conventions
911911
SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL;
912912
sixty_three | european_iso
913913
-------------+---------------------------
@@ -989,8 +989,8 @@ SELECT '' AS eight, f1 AS european_iso FROM ABSTIME_TBL;
989989
(8 rows)
990990

991991
SET DateStyle TO 'European,SQL';
992-
NOTICE: DateStyle is SQL with European conventions
993992
SHOW DateStyle;
993+
NOTICE: DateStyle is SQL with European conventions
994994
SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL;
995995
sixty_three | european_sql
996996
-------------+----------------------------
@@ -1072,14 +1072,14 @@ SELECT '' AS eight, f1 AS european_sql FROM ABSTIME_TBL;
10721072
(8 rows)
10731073

10741074
RESET DateStyle;
1075-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10761075
SHOW DateStyle;
1076+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10771077
--
10781078
-- formats
10791079
--
10801080
SET DateStyle TO 'US,Postgres';
1081-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10821081
SHOW DateStyle;
1082+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10831083
SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL;
10841084
sixty_two | us_postgres
10851085
-----------+---------------------------------
@@ -1242,8 +1242,8 @@ SELECT '' AS eight, f1 AS us_iso FROM ABSTIME_TBL;
12421242
(8 rows)
12431243

12441244
SET DateStyle TO 'US,SQL';
1245-
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
12461245
SHOW DateStyle;
1246+
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
12471247
SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL;
12481248
sixty_two | us_sql
12491249
-----------+----------------------------
@@ -1325,8 +1325,8 @@ SELECT '' AS eight, f1 AS us_sql FROM ABSTIME_TBL;
13251325
(8 rows)
13261326

13271327
SET DateStyle TO 'European,Postgres';
1328-
NOTICE: DateStyle is Postgres with European conventions
13291328
SHOW DateStyle;
1329+
NOTICE: DateStyle is Postgres with European conventions
13301330
INSERT INTO DATETIME_TBL VALUES('13/06/1957');
13311331
SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957';
13321332
one
@@ -1416,8 +1416,8 @@ SELECT '' AS eight, f1 AS european_postgres FROM ABSTIME_TBL;
14161416
(8 rows)
14171417

14181418
SET DateStyle TO 'European,ISO';
1419-
NOTICE: DateStyle is ISO with European conventions
14201419
SHOW DateStyle;
1420+
NOTICE: DateStyle is ISO with European conventions
14211421
SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL;
14221422
sixty_three | european_iso
14231423
-------------+---------------------------
@@ -1500,8 +1500,8 @@ SELECT '' AS eight, f1 AS european_iso FROM ABSTIME_TBL;
15001500
(8 rows)
15011501

15021502
SET DateStyle TO 'European,SQL';
1503-
NOTICE: DateStyle is SQL with European conventions
15041503
SHOW DateStyle;
1504+
NOTICE: DateStyle is SQL with European conventions
15051505
SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL;
15061506
sixty_three | european_sql
15071507
-------------+----------------------------
@@ -1584,5 +1584,5 @@ SELECT '' AS eight, f1 AS european_sql FROM ABSTIME_TBL;
15841584
(8 rows)
15851585

15861586
RESET DateStyle;
1587-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
15881587
SHOW DateStyle;
1588+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ DROP TABLE TEMP_DATETIME;
572572
-- formats
573573
--
574574
SET DateStyle TO 'US,Postgres';
575-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
576575
SHOW DateStyle;
576+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
577577
SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL;
578578
sixty_two | us_postgres
579579
-----------+---------------------------------
@@ -734,8 +734,8 @@ SELECT '' AS eight, f1 AS us_iso FROM ABSTIME_TBL;
734734
(8 rows)
735735

736736
SET DateStyle TO 'US,SQL';
737-
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
738737
SHOW DateStyle;
738+
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
739739
SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL;
740740
sixty_two | us_sql
741741
-----------+----------------------------
@@ -816,8 +816,8 @@ SELECT '' AS eight, f1 AS us_sql FROM ABSTIME_TBL;
816816
(8 rows)
817817

818818
SET DateStyle TO 'European,Postgres';
819-
NOTICE: DateStyle is Postgres with European conventions
820819
SHOW DateStyle;
820+
NOTICE: DateStyle is Postgres with European conventions
821821
INSERT INTO DATETIME_TBL VALUES('13/06/1957');
822822
SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957';
823823
one
@@ -906,8 +906,8 @@ SELECT '' AS eight, f1 AS european_postgres FROM ABSTIME_TBL;
906906
(8 rows)
907907

908908
SET DateStyle TO 'European,ISO';
909-
NOTICE: DateStyle is ISO with European conventions
910909
SHOW DateStyle;
910+
NOTICE: DateStyle is ISO with European conventions
911911
SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL;
912912
sixty_three | european_iso
913913
-------------+---------------------------
@@ -989,8 +989,8 @@ SELECT '' AS eight, f1 AS european_iso FROM ABSTIME_TBL;
989989
(8 rows)
990990

991991
SET DateStyle TO 'European,SQL';
992-
NOTICE: DateStyle is SQL with European conventions
993992
SHOW DateStyle;
993+
NOTICE: DateStyle is SQL with European conventions
994994
SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL;
995995
sixty_three | european_sql
996996
-------------+----------------------------
@@ -1072,14 +1072,14 @@ SELECT '' AS eight, f1 AS european_sql FROM ABSTIME_TBL;
10721072
(8 rows)
10731073

10741074
RESET DateStyle;
1075-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10761075
SHOW DateStyle;
1076+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10771077
--
10781078
-- formats
10791079
--
10801080
SET DateStyle TO 'US,Postgres';
1081-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10821081
SHOW DateStyle;
1082+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
10831083
SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL;
10841084
sixty_two | us_postgres
10851085
-----------+---------------------------------
@@ -1242,8 +1242,8 @@ SELECT '' AS eight, f1 AS us_iso FROM ABSTIME_TBL;
12421242
(8 rows)
12431243

12441244
SET DateStyle TO 'US,SQL';
1245-
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
12461245
SHOW DateStyle;
1246+
NOTICE: DateStyle is SQL with US (NonEuropean) conventions
12471247
SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL;
12481248
sixty_two | us_sql
12491249
-----------+----------------------------
@@ -1325,8 +1325,8 @@ SELECT '' AS eight, f1 AS us_sql FROM ABSTIME_TBL;
13251325
(8 rows)
13261326

13271327
SET DateStyle TO 'European,Postgres';
1328-
NOTICE: DateStyle is Postgres with European conventions
13291328
SHOW DateStyle;
1329+
NOTICE: DateStyle is Postgres with European conventions
13301330
INSERT INTO DATETIME_TBL VALUES('13/06/1957');
13311331
SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957';
13321332
one
@@ -1416,8 +1416,8 @@ SELECT '' AS eight, f1 AS european_postgres FROM ABSTIME_TBL;
14161416
(8 rows)
14171417

14181418
SET DateStyle TO 'European,ISO';
1419-
NOTICE: DateStyle is ISO with European conventions
14201419
SHOW DateStyle;
1420+
NOTICE: DateStyle is ISO with European conventions
14211421
SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL;
14221422
sixty_three | european_iso
14231423
-------------+---------------------------
@@ -1500,8 +1500,8 @@ SELECT '' AS eight, f1 AS european_iso FROM ABSTIME_TBL;
15001500
(8 rows)
15011501

15021502
SET DateStyle TO 'European,SQL';
1503-
NOTICE: DateStyle is SQL with European conventions
15041503
SHOW DateStyle;
1504+
NOTICE: DateStyle is SQL with European conventions
15051505
SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL;
15061506
sixty_three | european_sql
15071507
-------------+----------------------------
@@ -1584,5 +1584,5 @@ SELECT '' AS eight, f1 AS european_sql FROM ABSTIME_TBL;
15841584
(8 rows)
15851585

15861586
RESET DateStyle;
1587-
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions
15881587
SHOW DateStyle;
1588+
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,20 @@ ERROR: JOIN expressions are not yet implemented
127127
-- Outer joins
128128
--
129129
SELECT '' AS "xxx", *
130-
NOTICE: OUTER JOIN not yet implemented
131130
FROM JOIN1_TBL OUTER JOIN JOIN2_TBL USING (i);
131+
NOTICE: OUTER JOIN not yet implemented
132132
ERROR: JOIN expressions are not yet implemented
133133
SELECT '' AS "xxx", *
134-
NOTICE: LEFT OUTER JOIN not yet implemented
135134
FROM JOIN1_TBL LEFT OUTER JOIN JOIN2_TBL USING (i);
135+
NOTICE: LEFT OUTER JOIN not yet implemented
136136
ERROR: JOIN expressions are not yet implemented
137137
SELECT '' AS "xxx", *
138-
NOTICE: RIGHT OUTER JOIN not yet implemented
139138
FROM JOIN1_TBL RIGHT OUTER JOIN JOIN2_TBL USING (i);
139+
NOTICE: RIGHT OUTER JOIN not yet implemented
140140
ERROR: JOIN expressions are not yet implemented
141141
SELECT '' AS "xxx", *
142-
NOTICE: FULL OUTER JOIN not yet implemented
143142
FROM JOIN1_TBL FULL OUTER JOIN JOIN2_TBL USING (i);
143+
NOTICE: FULL OUTER JOIN not yet implemented
144144
ERROR: JOIN expressions are not yet implemented
145145
--
146146
-- More complicated constructs

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ ERROR: check_fkeys_pkey_exist: tuple references non-existing key in pkeys
7474
-- no key in fkeys2
7575
insert into fkeys values (60, '6', 4);
7676
ERROR: check_fkeys_pkey2_exist: tuple references non-existing key in fkeys2
77-
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
7877
delete from pkeys where pkey1 = 30 and pkey2 = '3';
79-
ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys
8078
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
81-
NOTICE:check_pkeys_fkey_cascade: 1tuple(s) of fkeys2 are deleted
79+
ERROR:check_fkeys2_fkey_restrict:tuple referenced in fkeys
8280
delete from pkeys where pkey1 = 40 and pkey2 = '4';
8381
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
82+
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted
8483
update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5';
84+
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
8585
ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys
86+
update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';
8687
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
8788
NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted
88-
update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';
8989
DROP TABLE pkeys;
9090
DROP TABLE fkeys;
9191
DROP TABLE fkeys2;

‎src/test/regress/output/constraints.source‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ CREATE TABLE tmp (xd INT, yd TEXT, zd INT);
180180
INSERT INTO tmp VALUES (null, 'Y', null);
181181
INSERT INTO tmp VALUES (5, '!check failed', null);
182182
INSERT INTO tmp VALUES (null, 'try again', null);
183-
NOTICE: insert_seq.nextval: sequence was re-created
184183
INSERT INTO INSERT_TBL(y) select yd from tmp;
184+
NOTICE: insert_seq.nextval: sequence was re-created
185185
SELECT '' AS three, * FROM INSERT_TBL;
186186
three | x | y | z
187187
-------+---+---------------+----
@@ -250,8 +250,8 @@ SELECT * FROM COPY_TBL;
250250
--
251251
-- Primary keys
252252
--
253-
NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
254253
CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text);
254+
NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
255255
INSERT INTO PRIMARY_TBL VALUES (1, 'one');
256256
INSERT INTO PRIMARY_TBL VALUES (2, 'two');
257257
INSERT INTO PRIMARY_TBL VALUES (1, 'three');
@@ -271,8 +271,8 @@ SELECT '' AS four, * FROM PRIMARY_TBL;
271271

272272
DROP TABLE PRIMARY_TBL;
273273
CREATE TABLE PRIMARY_TBL (i int, t text,
274-
NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
275274
PRIMARY KEY(i,t));
275+
NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
276276
INSERT INTO PRIMARY_TBL VALUES (1, 'one');
277277
INSERT INTO PRIMARY_TBL VALUES (2, 'two');
278278
INSERT INTO PRIMARY_TBL VALUES (1, 'three');
@@ -294,8 +294,8 @@ DROP TABLE PRIMARY_TBL;
294294
--
295295
-- Unique keys
296296
--
297-
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
298297
CREATE TABLE UNIQUE_TBL (i int UNIQUE, t text);
298+
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
299299
INSERT INTO UNIQUE_TBL VALUES (1, 'one');
300300
INSERT INTO UNIQUE_TBL VALUES (2, 'two');
301301
INSERT INTO UNIQUE_TBL VALUES (1, 'three');
@@ -317,8 +317,8 @@ SELECT '' AS five, * FROM UNIQUE_TBL;
317317

318318
DROP TABLE UNIQUE_TBL;
319319
CREATE TABLE UNIQUE_TBL (i int, t text,
320-
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
321320
UNIQUE(i,t));
321+
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
322322
INSERT INTO UNIQUE_TBL VALUES (1, 'one');
323323
INSERT INTO UNIQUE_TBL VALUES (2, 'two');
324324
INSERT INTO UNIQUE_TBL VALUES (1, 'three');

‎src/test/regress/output/create_function_1.source‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
CREATE FUNCTION widget_in(opaque)
55
RETURNS widget
66
AS '_OBJWD_/regress_DLSUFFIX_'
7-
NOTICE: ProcedureCreate: type 'widget' is not yet defined
87
LANGUAGE 'c';
8+
NOTICE: ProcedureCreate: type 'widget' is not yet defined
99
CREATE FUNCTION widget_out(opaque)
1010
RETURNS opaque
1111
AS '_OBJWD_/regress_DLSUFFIX_'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp