1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to reduce locale dependencies in regression tests.

Browse Source 
Commit 3e9a2672d25aed15ae6b4a09decbd8927d069868 fixed this for master,
but REL9_1_STABLE also needs fixing; this is a back-branch commit only.

Tomas Vondra
This commit is contained in:
Robert Haas 2012-03-07 17:19:18 -05:00
parent e076ee6d3f
commit 610fd3442d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/regress/expected/foreign_data.out
View File

@ -631,25 +631,25 @@ DROP SERVER s7;
-- CREATE FOREIGN TABLE -- CREATE FOREIGN TABLE
CREATE SCHEMA foreign_schema; CREATE SCHEMA foreign_schema;
CREATE SERVER sc FOREIGN DATA WRAPPER dummy; CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
CREATE FOREIGN TABLE ft1 (); -- ERROR CREATE FOREIGN TABLE ft1 (); -- ERROR
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
LINE 1: CREATE FOREIGN TABLE ft1 (); LINE 1: CREATE FOREIGN TABLE ft1 ();
^ ^
CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR
ERROR: server "no_server" does not exist ERROR: server "no_server" does not exist
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER sc; -- ERROR CREATE FOREIGN TABLE ft1 (c1 serial) SERVER s0; -- ERROR
NOTICE: CREATE FOREIGN TABLE will create implicit sequence "ft1_c1_seq" for serial column "ft1.c1" NOTICE: CREATE FOREIGN TABLE will create implicit sequence "ft1_c1_seq" for serial column "ft1.c1"
ERROR: default values on foreign tables are not supported ERROR: default values on foreign tables are not supported
CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS; -- ERROR CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS; -- ERROR
ERROR: syntax error at or near "WITH OIDS" ERROR: syntax error at or near "WITH OIDS"
LINE 1: CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS; LINE 1: CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS;
^ ^
CREATE FOREIGN TABLE ft1 ( CREATE FOREIGN TABLE ft1 (
c1 integer NOT NULL, c1 integer NOT NULL,
c2 text, c2 text,
c3 date c3 date
) SERVER sc OPTIONS (delimiter ',', quote '"'); ) SERVER s0 OPTIONS (delimiter ',', quote '"');
COMMENT ON FOREIGN TABLE ft1 IS 'ft1'; COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
COMMENT ON COLUMN ft1.c1 IS 'ft1.c1'; COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
\d+ ft1 \d+ ft1
@ -659,14 +659,14 @@ COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
c1 | integer | not null | plain | ft1.c1 c1 | integer | not null | plain | ft1.c1
c2 | text | | extended | c2 | text | | extended |
c3 | date | | plain | c3 | date | | plain |
Server: sc Server: s0
Has OIDs: no Has OIDs: no
\det+ \det+
List of foreign tables List of foreign tables
Schema | Table | Server | Options Schema | Table | Server | Options
--------+-------+--------+---------------------------- --------+-------+--------+----------------------------
public | ft1 | sc | {"delimiter=,","quote=\""} public | ft1 | s0 | {"delimiter=,","quote=\""}
(1 row) (1 row)
CREATE INDEX id_ft1_c2 ON ft1 (c2); -- ERROR CREATE INDEX id_ft1_c2 ON ft1 (c2); -- ERROR
@ -737,7 +737,7 @@ Foreign table "foreign_schema.foreign_table_1"
c7 | integer | c7 | integer |
c8 | text | c8 | text |
c10 | integer | c10 | integer |
Server: sc Server: s0
-- Information schema -- Information schema
SELECT * FROM information_schema.foreign_data_wrappers ORDER BY 1, 2; 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;
SELECT * FROM information_schema.foreign_servers ORDER BY 1, 2; SELECT * FROM information_schema.foreign_servers ORDER BY 1, 2;
foreign_server_catalog | foreign_server_name | foreign_data_wrapper_catalog | foreign_data_wrapper_name | foreign_server_type | foreign_server_version | authorization_identifier foreign_server_catalog | foreign_server_name | foreign_data_wrapper_catalog | foreign_data_wrapper_name | foreign_server_type | foreign_server_version | authorization_identifier
------------------------+---------------------+------------------------------+---------------------------+---------------------+------------------------+-------------------------- ------------------------+---------------------+------------------------------+---------------------------+---------------------+------------------------+--------------------------
regression | s0 | regression | dummy | | | foreign_data_user
regression | s4 | regression | foo | oracle | | foreign_data_user regression | s4 | regression | foo | oracle | | foreign_data_user
regression | s5 | regression | foo | | 15.0 | regress_test_role regression | s5 | regression | foo | | 15.0 | regress_test_role
regression | s6 | regression | foo | | 16.0 | regress_test_indirect regression | s6 | regression | foo | | 16.0 | regress_test_indirect
regression | s8 | regression | postgresql | | | foreign_data_user regression | s8 | regression | postgresql | | | foreign_data_user
regression | sc | regression | dummy | | | foreign_data_user
regression | t1 | regression | foo | | | regress_test_indirect regression | t1 | regression | foo | | | regress_test_indirect
regression | t2 | regression | foo | | | regress_test_role regression | t2 | regression | foo | | | regress_test_role
(7 rows) (7 rows)
@ -823,7 +823,7 @@ SELECT * FROM information_schema.role_usage_grants WHERE object_type LIKE 'FOREI
SELECT * FROM information_schema.foreign_tables ORDER BY 1, 2, 3; SELECT * FROM information_schema.foreign_tables ORDER BY 1, 2, 3;
foreign_table_catalog | foreign_table_schema | foreign_table_name | foreign_server_catalog | foreign_server_name foreign_table_catalog | foreign_table_schema | foreign_table_name | foreign_server_catalog | foreign_server_name
-----------------------+----------------------+--------------------+------------------------+--------------------- -----------------------+----------------------+--------------------+------------------------+---------------------
regression | foreign_schema | foreign_table_1 | regression | sc regression | foreign_schema | foreign_table_1 | regression | s0
(1 row) (1 row)
SELECT * FROM information_schema.foreign_table_options ORDER BY 1, 2, 3, 4; SELECT * FROM information_schema.foreign_table_options ORDER BY 1, 2, 3, 4;
@ -1106,7 +1106,7 @@ DROP ROLE unprivileged_role;
DROP ROLE regress_test_role2; DROP ROLE regress_test_role2;
DROP FOREIGN DATA WRAPPER postgresql CASCADE; DROP FOREIGN DATA WRAPPER postgresql CASCADE;
DROP FOREIGN DATA WRAPPER dummy CASCADE; DROP FOREIGN DATA WRAPPER dummy CASCADE;
NOTICE: drop cascades to server sc NOTICE: drop cascades to server s0
\c \c
DROP ROLE foreign_data_user; DROP ROLE foreign_data_user;
-- At this point we should have no wrappers, no servers, and no mappings. -- At this point we should have no wrappers, no servers, and no mappings.

8
src/test/regress/sql/foreign_data.sql
View File

@ -258,16 +258,16 @@ DROP SERVER s7;
-- CREATE FOREIGN TABLE -- CREATE FOREIGN TABLE
CREATE SCHEMA foreign_schema; CREATE SCHEMA foreign_schema;
CREATE SERVER sc FOREIGN DATA WRAPPER dummy; CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
CREATE FOREIGN TABLE ft1 (); -- ERROR CREATE FOREIGN TABLE ft1 (); -- ERROR
CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR CREATE FOREIGN TABLE ft1 () SERVER no_server; -- ERROR
CREATE FOREIGN TABLE ft1 (c1 serial) SERVER sc; -- ERROR CREATE FOREIGN TABLE ft1 (c1 serial) SERVER s0; -- ERROR
CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS; -- ERROR CREATE FOREIGN TABLE ft1 () SERVER s0 WITH OIDS; -- ERROR
CREATE FOREIGN TABLE ft1 ( CREATE FOREIGN TABLE ft1 (
c1 integer NOT NULL, c1 integer NOT NULL,
c2 text, c2 text,
c3 date c3 date
) SERVER sc OPTIONS (delimiter ',', quote '"'); ) SERVER s0 OPTIONS (delimiter ',', quote '"');
COMMENT ON FOREIGN TABLE ft1 IS 'ft1'; COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
COMMENT ON COLUMN ft1.c1 IS 'ft1.c1'; COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
\d+ ft1 \d+ ft1