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

Commit838fb5c

Browse files
committed
Update for change of 'duplicate key' message.
1 parentb04bdf1 commit838fb5c

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ QUERY: insert into PSlot values ('PS.1st.d6', 'PF1_1', '', 'WS.106.3b');
973973
QUERY: update PSlot set backlink = 'WS.001.1a' where slotname = 'PS.base.a1';
974974
QUERY: update PSlot set backlink = 'WS.001.1b' where slotname = 'PS.base.a3';
975975
QUERY: select * from WSlot where roomno = '001' order by slotname;
976-
slotname | roomno|slotlink|backlink
976+
slotname |roomno |slotlink |backlink
977977
--------------------+--------+--------------------+--------------------
978978
WS.001.1a |001 | |PS.base.a1
979979
WS.001.1b |001 | |PS.base.a3
@@ -984,7 +984,7 @@ WS.001.3b |001 | |
984984
(6 rows)
985985

986986
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
987-
slotname |pfname|slotlink|backlink
987+
slotname |pfname|slotlink |backlink
988988
--------------------+------+--------------------+--------------------
989989
PS.base.a1 |PF0_1 | |WS.001.1a
990990
PS.base.a2 |PF0_1 | |
@@ -996,7 +996,7 @@ PS.base.a6 |PF0_1 | |
996996

997997
QUERY: update PSlot set backlink = 'WS.001.2a' where slotname = 'PS.base.a3';
998998
QUERY: select * from WSlot where roomno = '001' order by slotname;
999-
slotname | roomno|slotlink|backlink
999+
slotname |roomno |slotlink |backlink
10001000
--------------------+--------+--------------------+--------------------
10011001
WS.001.1a |001 | |PS.base.a1
10021002
WS.001.1b |001 | |
@@ -1007,7 +1007,7 @@ WS.001.3b |001 | |
10071007
(6 rows)
10081008

10091009
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
1010-
slotname |pfname|slotlink|backlink
1010+
slotname |pfname|slotlink |backlink
10111011
--------------------+------+--------------------+--------------------
10121012
PS.base.a1 |PF0_1 | |WS.001.1a
10131013
PS.base.a2 |PF0_1 | |
@@ -1019,7 +1019,7 @@ PS.base.a6 |PF0_1 | |
10191019

10201020
QUERY: update PSlot set backlink = 'WS.001.1b' where slotname = 'PS.base.a2';
10211021
QUERY: select * from WSlot where roomno = '001' order by slotname;
1022-
slotname | roomno|slotlink|backlink
1022+
slotname |roomno |slotlink |backlink
10231023
--------------------+--------+--------------------+--------------------
10241024
WS.001.1a |001 | |PS.base.a1
10251025
WS.001.1b |001 | |PS.base.a2
@@ -1030,7 +1030,7 @@ WS.001.3b |001 | |
10301030
(6 rows)
10311031

10321032
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
1033-
slotname |pfname|slotlink|backlink
1033+
slotname |pfname|slotlink |backlink
10341034
--------------------+------+--------------------+--------------------
10351035
PS.base.a1 |PF0_1 | |WS.001.1a
10361036
PS.base.a2 |PF0_1 | |WS.001.1b
@@ -1043,7 +1043,7 @@ PS.base.a6 |PF0_1 | |
10431043
QUERY: update WSlot set backlink = 'PS.base.a4' where slotname = 'WS.001.2b';
10441044
QUERY: update WSlot set backlink = 'PS.base.a6' where slotname = 'WS.001.3a';
10451045
QUERY: select * from WSlot where roomno = '001' order by slotname;
1046-
slotname | roomno|slotlink|backlink
1046+
slotname |roomno |slotlink |backlink
10471047
--------------------+--------+--------------------+--------------------
10481048
WS.001.1a |001 | |PS.base.a1
10491049
WS.001.1b |001 | |PS.base.a2
@@ -1054,7 +1054,7 @@ WS.001.3b |001 | |
10541054
(6 rows)
10551055

10561056
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
1057-
slotname |pfname|slotlink|backlink
1057+
slotname |pfname|slotlink |backlink
10581058
--------------------+------+--------------------+--------------------
10591059
PS.base.a1 |PF0_1 | |WS.001.1a
10601060
PS.base.a2 |PF0_1 | |WS.001.1b
@@ -1066,7 +1066,7 @@ PS.base.a6 |PF0_1 | |WS.001.3a
10661066

10671067
QUERY: update WSlot set backlink = 'PS.base.a6' where slotname = 'WS.001.3b';
10681068
QUERY: select * from WSlot where roomno = '001' order by slotname;
1069-
slotname | roomno|slotlink|backlink
1069+
slotname |roomno |slotlink |backlink
10701070
--------------------+--------+--------------------+--------------------
10711071
WS.001.1a |001 | |PS.base.a1
10721072
WS.001.1b |001 | |PS.base.a2
@@ -1077,7 +1077,7 @@ WS.001.3b |001 | |PS.base.a6
10771077
(6 rows)
10781078

10791079
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
1080-
slotname |pfname|slotlink|backlink
1080+
slotname |pfname|slotlink |backlink
10811081
--------------------+------+--------------------+--------------------
10821082
PS.base.a1 |PF0_1 | |WS.001.1a
10831083
PS.base.a2 |PF0_1 | |WS.001.1b
@@ -1089,7 +1089,7 @@ PS.base.a6 |PF0_1 | |WS.001.3b
10891089

10901090
QUERY: update WSlot set backlink = 'PS.base.a5' where slotname = 'WS.001.3a';
10911091
QUERY: select * from WSlot where roomno = '001' order by slotname;
1092-
slotname | roomno|slotlink|backlink
1092+
slotname |roomno |slotlink |backlink
10931093
--------------------+--------+--------------------+--------------------
10941094
WS.001.1a |001 | |PS.base.a1
10951095
WS.001.1b |001 | |PS.base.a2
@@ -1100,7 +1100,7 @@ WS.001.3b |001 | |PS.base.a6
11001100
(6 rows)
11011101

11021102
QUERY: select * from PSlot where slotname ~ 'PS.base.a' order by slotname;
1103-
slotname |pfname|slotlink|backlink
1103+
slotname |pfname|slotlink |backlink
11041104
--------------------+------+--------------------+--------------------
11051105
PS.base.a1 |PF0_1 | |WS.001.1a
11061106
PS.base.a2 |PF0_1 | |WS.001.1b
@@ -1125,7 +1125,7 @@ QUERY: insert into PSlot values ('PS.1st.tb5', 'PF1_2', '', '');
11251125
QUERY: insert into PSlot values ('PS.1st.tb6', 'PF1_2', '', '');
11261126
QUERY: update PField set name = 'PF0_2' where name = 'PF0_X';
11271127
QUERY: select * from PSlot order by slotname;
1128-
slotname |pfname|slotlink|backlink
1128+
slotname |pfname|slotlink |backlink
11291129
--------------------+------+--------------------+--------------------
11301130
PS.1st.a1 |PF1_1 | |WS.101.1a
11311131
PS.1st.a2 |PF1_1 | |WS.101.1b
@@ -1196,7 +1196,7 @@ PS.base.tb6 |PF0_2 | |
11961196
(66 rows)
11971197

11981198
QUERY: select * from WSlot order by slotname;
1199-
slotname | roomno|slotlink|backlink
1199+
slotname |roomno |slotlink |backlink
12001200
--------------------+--------+--------------------+--------------------
12011201
WS.001.1a |001 | |PS.base.a1
12021202
WS.001.1b |001 | |PS.base.a2
@@ -1315,7 +1315,7 @@ PF0_2 |PS.base.tb6 |Phone line -122 |-
13151315
(12 rows)
13161316

13171317
QUERY: insert into PField values ('PF1_1', 'should fail due to unique index');
1318-
ERROR: Cannot insert a duplicate key intoaunique index
1318+
ERROR: Cannot insert a duplicate key into unique index pfield_name
13191319
QUERY: update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
13201320
ERROR: WS.not.there does not exists
13211321
QUERY: update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
@@ -1325,7 +1325,7 @@ ERROR: PS.not.there does not exists
13251325
QUERY: update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
13261326
ERROR: illegal slotlink beginning with XX
13271327
QUERY: insert into HSlot values ('HS', 'base.hub1', 1, '');
1328-
ERROR: Cannot insert a duplicate key intoaunique index
1328+
ERROR: Cannot insert a duplicate key into unique index hslot_name
13291329
QUERY: insert into HSlot values ('HS', 'base.hub1', 20, '');
13301330
ERROR: no manual manipulation of HSlot
13311331
QUERY: delete from HSlot;

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,28 @@ hash_name_heap|t
1616
hash_txt_heap |t
1717
ihighway |t
1818
onek |t
19+
pg_aggregate |t
20+
pg_am |t
1921
pg_amop |t
2022
pg_attrdef |t
2123
pg_attribute |t
2224
pg_class |t
2325
pg_description|t
26+
pg_group |t
2427
pg_index |t
28+
pg_inherits |t
29+
pg_language |t
30+
pg_listener |t
31+
pg_opclass |t
32+
pg_operator |t
2533
pg_proc |t
2634
pg_relcheck |t
35+
pg_rewrite |t
2736
pg_trigger |t
2837
pg_type |t
2938
road |t
3039
shighway |t
3140
tenk1 |t
3241
tenk2 |t
33-
(25 rows)
42+
(34 rows)
3443

0 commit comments

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