Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 610fd34

Browse files
robertmhaasrobertmhaas
committed
Attempt to reduce locale dependencies in regression tests.
Commit 3e9a267 fixed this for master, but REL9_1_STABLE also needs fixing; this is a back-branch commit only. Tomas Vondra
1 parent e076ee6 commit 610fd34

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -631,25 +631,25 @@ DROP SERVER s7;
631631

632632
-- CREATE FOREIGN TABLE
633633
CREATE SCHEMA foreign_schema;
634-
CREATE SERVER sc FOREIGN DATA WRAPPER dummy;
634+
CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
635635
CREATE FOREIGN TABLE ft1 (); -- ERROR
636636
ERROR: syntax error at or near ";"
637637
LINE 1: CREATE FOREIGN TABLE ft1 ();
638638
^
639639
CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR
640640
ERROR: server "no_server" does not exist
641-
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER sc; -- ERROR
641+
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER s0; -- ERROR
642642
NOTICE: CREATE FOREIGN TABLE will create implicit sequence "ft1_c1_seq" for serial column "ft1.c1"
643643
ERROR: default values on foreign tables are not supported
644-
CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS; -- ERROR
644+
CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS; -- ERROR
645645
ERROR: syntax error at or near "WITH OIDS"
646-
LINE 1: CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS;
646+
LINE 1: CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS;
647647
^
648648
CREATE FOREIGN TABLE ft1 (
649649
c1 integer NOT NULL,
650650
c2 text,
651651
c3 date
652-
) SERVER sc OPTIONS (delimiter ',', quote '"');
652+
) SERVER s0 OPTIONS (delimiter ',', quote '"');
653653
COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
654654
COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
655655
\d+ ft1
@@ -659,14 +659,14 @@ COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
659659
c1 | integer | not null | plain | ft1.c1
660660
c2 | text | | extended |
661661
c3 | date | | plain |
662-
Server: sc
662+
Server: s0
663663
Has OIDs: no
664664

665665
\det+
666666
List of foreign tables
667667
Schema | Table | Server | Options
668668
--------+-------+--------+----------------------------
669-
public | ft1 | sc | {"delimiter=,","quote=\""}
669+
public | ft1 | s0 | {"delimiter=,","quote=\""}
670670
(1 row)
671671

672672
CREATE INDEX id_ft1_c2 ON ft1 (c2); -- ERROR
@@ -737,7 +737,7 @@ Foreign table "foreign_schema.foreign_table_1"
737737
c7 | integer |
738738
c8 | text |
739739
c10 | integer |
740-
Server: sc
740+
Server: s0
741741

742742
-- Information schema
743743
SELECT * FROM information_schema.foreign_data_wrappers ORDER BY 1, 2;
@@ -757,11 +757,11 @@ SELECT * FROM information_schema.foreign_data_wrapper_options ORDER BY 1, 2, 3;
757757
SELECT * FROM information_schema.foreign_servers ORDER BY 1, 2;
758758
foreign_server_catalog | foreign_server_name | foreign_data_wrapper_catalog | foreign_data_wrapper_name | foreign_server_type | foreign_server_version | authorization_identifier
759759
------------------------+---------------------+------------------------------+---------------------------+---------------------+------------------------+--------------------------
760+
regression | s0 | regression | dummy | | | foreign_data_user
760761
regression | s4 | regression | foo | oracle | | foreign_data_user
761762
regression | s5 | regression | foo | | 15.0 | regress_test_role
762763
regression | s6 | regression | foo | | 16.0 | regress_test_indirect
763764
regression | s8 | regression | postgresql | | | foreign_data_user
764-
regression | sc | regression | dummy | | | foreign_data_user
765765
regression | t1 | regression | foo | | | regress_test_indirect
766766
regression | t2 | regression | foo | | | regress_test_role
767767
(7 rows)
@@ -823,7 +823,7 @@ SELECT * FROM information_schema.role_usage_grants WHERE object_type LIKE 'FOREI
823823
SELECT * FROM information_schema.foreign_tables ORDER BY 1, 2, 3;
824824
foreign_table_catalog | foreign_table_schema | foreign_table_name | foreign_server_catalog | foreign_server_name
825825
-----------------------+----------------------+--------------------+------------------------+---------------------
826-
regression | foreign_schema | foreign_table_1 | regression | sc
826+
regression | foreign_schema | foreign_table_1 | regression | s0
827827
(1 row)
828828

829829
SELECT * FROM information_schema.foreign_table_options ORDER BY 1, 2, 3, 4;
@@ -1106,7 +1106,7 @@ DROP ROLE unprivileged_role;
11061106
DROP ROLE regress_test_role2;
11071107
DROP FOREIGN DATA WRAPPER postgresql CASCADE;
11081108
DROP FOREIGN DATA WRAPPER dummy CASCADE;
1109-
NOTICE: drop cascades to server sc
1109+
NOTICE: drop cascades to server s0
11101110
\c
11111111
DROP ROLE foreign_data_user;
11121112
-- At this point we should have no wrappers, no servers, and no mappings.

‎src/test/regress/sql/foreign_data.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,16 @@ DROP SERVER s7;
258258

259259
-- CREATE FOREIGN TABLE
260260
CREATE SCHEMA foreign_schema;
261-
CREATE SERVER sc FOREIGN DATA WRAPPER dummy;
261+
CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
262262
CREATE FOREIGN TABLE ft1 (); -- ERROR
263263
CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR
264-
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER sc; -- ERROR
265-
CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS; -- ERROR
264+
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER s0; -- ERROR
265+
CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS; -- ERROR
266266
CREATE FOREIGN TABLE ft1 (
267267
c1 integer NOT NULL,
268268
c2 text,
269269
c3 date
270-
) SERVER sc OPTIONS (delimiter ',', quote '"');
270+
) SERVER s0 OPTIONS (delimiter ',', quote '"');
271271
COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
272272
COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
273273
\d+ ft1

0 commit comments

Comments
 (0)