8000 Fix regression test outputs · postgrespro/postgres_cluster@6ba500c · GitHub
[go: up one dir, main page]
Skip to content {"props":{"docsUrl":"https://docs.github.com/get-started/accessibility/keyboard-shortcuts"}}

Commit 6ba500c

Browse files
michaelpqmichaelpq
committed
Fix regression test outputs
75445c1 has caused various failures in tests across the tree after updating some error messages, so fix the newly-expected output. Author: Michael Paquier Reviewed-by: Tom Lane Discussion: https://postgr.es/m/8332.1558048838@sss.pgh.pa.us
1 parent 41998f9 commit 6ba500c

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

‎contrib/citext/expected/citext.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citex
18411841

18421842
-- g is not allowed
18431843
SELECT regexp_match('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g') AS "error";
1844-
ERROR: regexp_match does not support the global option
1844+
ERROR: regexp_match() does not support the "global" option
18451845
HINT: Use the regexp_matches function instead.
18461846
CONTEXT: SQL function "regexp_match" statement 1
18471847
SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

‎contrib/citext/expected/citext_1.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citex
18411841

18421842
-- g is not allowed
18431843
SELECT regexp_match('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g') AS "error";
1844-
ERROR: regexp_match does not support the global option
1844+
ERROR: regexp_match() does not support the "global" option
18451845
HINT: Use the regexp_matches function instead.
18461846
CONTEXT: SQL function "regexp_match" statement 1
18471847
SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,20 +360,20 @@ SELECT * FROM vistest;
360360
COMMIT;
361361
TRUNCATE vistest;
362362
COPY vistest FROM stdin CSV FREEZE;
363-
ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
363+
ERROR: cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction
364364
BEGIN;
365365
TRUNCATE vistest;
366366
SAVEPOINT s1;
367367
COPY vistest FROM stdin CSV FREEZE;
368-
ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
368+
ERROR: cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction
369369
COMMIT;
370370
BEGIN;
371371
INSERT INTO vistest VALUES ('z');
372372
SAVEPOINT s1;
373373
TRUNCATE vistest;
374374
ROLLBACK TO SAVEPOINT s1;
375375
COPY vistest FROM stdin CSV FREEZE;
376-
ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
376+
ERROR: cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction
377377
COMMIT;
378378
CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS
379379
$$

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ ERROR: partition key expressions cannot contain whole-row references
418418
CREATE TABLE partitioned (
419419
a point
420420
) PARTITION BY LIST (a);
421-
ERROR: data type point has no default btree operator class
421+
ERROR: data type point has no default operator class for access method "btree"
422422
HINT: You must specify a btree operator class or define a default btree operator class for the data type.
423423
CREATE TABLE partitioned (
424424
a point
@@ -427,7 +427,7 @@ ERROR: operator class "point_ops" does not exist for access method "btree"
427427
CREATE TABLE partitioned (
428428
a point
429429
) PARTITION BY RANGE (a);
430-
ERROR: data type point has no default btree operator class
430+
ERROR: data type point has no default operator class for access method "btree"
431431
HINT: You must specify a btree operator class or define a default btree operator class for the data type.
432432
CREATE TABLE partitioned (
433433
a point

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ select * from jsonb_path_query('{"a": 10}', '$');
486486
(1 row)
487487

488488
select * from jsonb_path_query('{"a": 10}', '$ ? (@.a < $value)');
489-
ERROR: cannot find jsonpath variable "value"
489+
ERROR: could not find jsonpath variable "value"
490490
select * from jsonb_path_query('{"a": 10}', '$ ? (@.a < $value)', '1');
491491
ERROR: "vars" argument is not an object
492492
DETAIL: Jsonpath parameters should be encoded as key-value pairs of "vars" object.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--jsonpath io
22
select ''::jsonpath;
3-
ERROR: invalid input syntax for jsonpath: ""
3+
ERROR: invalid input syntax for type jsonpath: ""
44
LINE 1: select ''::jsonpath;
55
^
66
select '$'::jsonpath;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CREATE PUBLICATION testpib_ins_trunct WITH (publish = insert);
1717
ALTER PUBLICATION testpub_default SET (publish = update);
1818
-- error cases
1919
CREATE PUBLICATION testpub_xxx WITH (foo);
20-
ERROR: unrecognized publication parameter: foo
20+
ERROR: unrecognized publication parameter: "foo"
2121
CREATE PUBLICATION testpub_xxx WITH (publish = 'cluster, vacuum');
2222
ERROR: unrecognized "publish" value: "cluster"
2323
\dRp

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ select regexp_match('abc', '(B)(c)', 'i');
116116
(1 row)
117117

118118
select regexp_match('abc', 'Bd', 'ig'); -- error
119-
ERROR: regexp_match does not support the global option
119+
ERROR: regexp_match() does not support the "global" option
120120
HINT: Use the regexp_matches function instead.
121121
-- Test lookahead constraints
122122
select regexp_matches('ab', 'a(?=b)b*');

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ SELECT regexp_replace('AAA aaa', 'A+', 'Z', 'gi');
437437

438438
-- invalid regexp option
439439
SELECT regexp_replace('AAA aaa', 'A+', 'Z', 'z');
440-
ERROR: invalid regexp option: "z"
440+
ERROR: invalid regular expression option: "z"
441441
-- set so we can tell NULL from empty string
442442
\pset null '\\N'
443443
-- return all matches from regexp
@@ -549,7 +549,7 @@ SELECT regexp_matches(chr(10) || '1' || chr(10) || '2' || chr(10) || '3' || chr(
549549

550550
-- give me errors
551551
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque)$re$, 'gz');
552-
ERROR: invalid regexp option: "z"
552+
ERROR: invalid regular expression option: "z"
553553
SELECT regexp_matches('foobarbequebaz', $re$(barbeque$re$);
554554
ERROR: invalid regular expression: parentheses () not balanced
555555
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
@@ -743,14 +743,14 @@ SELECT regexp_split_to_array('1','');
743743

744744
-- errors
745745
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'zippy') AS foo;
746-
ERROR: invalid regexp option: "z"
746+
ERROR: invalid regular expression option: "z"
747747
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'iz');
748-
ERROR: invalid regexp option: "z"
748+
ERROR: invalid regular expression option: "z"
749749
-- global option meaningless for regexp_split
750750
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g') AS foo;
751-
ERROR: regexp_split_to_table does not support the global option
751+
ERROR: regexp_split_to_table() does not support the "global" option
752752
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g');
753-
ERROR: regexp_split_to_array does not support the global option
753+
ERROR: regexp_split_to_array() does not support the "global" option
754754
-- change NULL-display back
755755
\pset null ''
756756
-- E021-11 position expression

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ERROR: connect = false and enabled = true are mutually exclusive options
5353
CREATE SUBSCRIPTION testsub2 CONNECTION 'dbname=doesnotexist' PUBLICATION testpub WITH (connect = false, create_slot = true);
5454
ERROR: connect = false and create_slot = true are mutually exclusive options
5555
CREATE SUBSCRIPTION testsub2 CONNECTION 'dbname=doesnotexist' PUBLICATION testpub WITH (slot_name = NONE, enabled = true);
56-
ERROR: slot_name = NONE and enabled = true are mutually exclusive options
56+
ERROR: slot_name = NONE and enable = true are mutually exclusive options
5757
CREATE SUBSCRIPTION testsub2 CONNECTION 'dbname=doesnotexist' PUBLICATION testpub WITH (slot_name = NONE, create_slot = true);
5858
ERROR: slot_name = NONE and create_slot = true are mutually exclusive options
5959
CREATE SUBSCRIPTION testsub2 CONNECTION 'dbname=doesnotexist' PUBLICATION testpub WITH (slot_name = NONE);
@@ -89,7 +89,7 @@ ALTER SUBSCRIPTION testsub SET (slot_name = 'newname');
8989
ALTER SUBSCRIPTION doesnotexist CONNECTION 'dbname=doesnotexist2';
9090
ERROR: subscription "doesnotexist" does not exist
9191
ALTER SUBSCRIPTION testsub SET (create_slot = false);
92-
ERROR: unrecognized subscription parameter: create_slot
92+
ERROR: unrecognized subscription parameter: "create_slot"
9393
\dRs+
9494
List of subscriptions
9595
Name | Owner | Enabled | Publication | Synchronous commit | Conninfo

0 commit comments

Comments
 (0)
0