diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-10-10 20:14:26 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-10-10 20:14:26 -0400 |
| commit | c3bf3ea2b61c312cc813edd9bb43aa338ae9288c (patch) | |
| tree | 8056cb6c133217554b35c4268ba84cd24665242a | |
| parent | 864db11683df44dae51f8f9fc8a4c124e100d2f3 (diff) | |
| download | postgresql-c3bf3ea2b61c312cc813edd9bb43aa338ae9288c.tar.gz postgresql-c3bf3ea2b61c312cc813edd9bb43aa338ae9288c.zip | |
Remove configure-option-dependent test cases from dblink tests.
The HINTs generated for these error cases vary across builds. We
could try to work around that, but the test cases aren't really useful
enough to justify taking any trouble.
Per buildfarm.
| -rw-r--r-- | contrib/dblink/expected/dblink.out | 8 | ||||
| -rw-r--r-- | contrib/dblink/sql/dblink.sql | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 974d001be93..78b4a99606a 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -784,14 +784,6 @@ SELECT dblink_disconnect('dtest1'); -- test foreign data wrapper functionality CREATE USER dblink_regression_test; CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (invalid 'val'); -- fail, invalid option -ERROR: invalid option "invalid" -HINT: Valid options in this context are: service, connect_timeout, dbname, host, hostaddr, port, application_name, fallback_application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, requirepeer -CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (password 'val'); -- fail, can't specify password here -ERROR: invalid option "password" -HINT: Valid options in this context are: service, connect_timeout, dbname, host, hostaddr, port, application_name, fallback_application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, requirepeer -CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw OPTIONS (dbname 'contrib_regression'); CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (server 'localhost'); -- fail, can't specify server here diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql index 0372af61827..4f72ccf1d8e 100644 --- a/contrib/dblink/sql/dblink.sql +++ b/contrib/dblink/sql/dblink.sql @@ -360,14 +360,8 @@ SELECT dblink_disconnect('dtest1'); -- test foreign data wrapper functionality CREATE USER dblink_regression_test; - -CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (invalid 'val'); -- fail, invalid option -CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (password 'val'); -- fail, can't specify password here CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw OPTIONS (dbname 'contrib_regression'); - CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (server 'localhost'); -- fail, can't specify server here CREATE USER MAPPING FOR public SERVER fdtest; |