diff options
| author | Tom Lane | 2011-10-12 19:45:03 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-10-12 19:45:03 +0000 |
| commit | 458857cc9d7d00711b272a0dabbcb591b506d6b8 (patch) | |
| tree | 2b4acca78ee2fba19273d10aa01eccc4bc111d4b /contrib/dblink | |
| parent | e0d273500a84ab94c69cbfa10ea0537604fbdda3 (diff) | |
Throw a useful error message if an extension script file is fed to psql.
We have seen one too many reports of people trying to use 9.1 extension
files in the old-fashioned way of sourcing them in psql. Not only does
that usually not work (due to failure to substitute for MODULE_PATHNAME
and/or @extschema@), but if it did work they'd get a collection of loose
objects not an extension. To prevent this, insert an \echo ... \quit
line that prints a suitable error message into each extension script file,
and teach commands/extension.c to ignore lines starting with \echo.
That should not only prevent any adverse consequences of loading a script
file the wrong way, but make it crystal clear to users that they need to
do it differently now.
Tom Lane, following an idea of Andrew Dunstan's. Back-patch into 9.1
... there is not going to be much value in this if we wait till 9.2.
Diffstat (limited to 'contrib/dblink')
| -rw-r--r-- | contrib/dblink/dblink--1.0.sql | 3 | ||||
| -rw-r--r-- | contrib/dblink/dblink--unpackaged--1.0.sql | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/contrib/dblink/dblink--1.0.sql b/contrib/dblink/dblink--1.0.sql index 4ac55144619..1fec9e39441 100644 --- a/contrib/dblink/dblink--1.0.sql +++ b/contrib/dblink/dblink--1.0.sql @@ -1,5 +1,8 @@ /* contrib/dblink/dblink--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION dblink" to load this file. \quit + -- dblink_connect now restricts non-superusers to password -- authenticated connections CREATE FUNCTION dblink_connect (text) diff --git a/contrib/dblink/dblink--unpackaged--1.0.sql b/contrib/dblink/dblink--unpackaged--1.0.sql index b6d184b4a2c..29f5bed0c13 100644 --- a/contrib/dblink/dblink--unpackaged--1.0.sql +++ b/contrib/dblink/dblink--unpackaged--1.0.sql @@ -1,5 +1,8 @@ /* contrib/dblink/dblink--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION dblink" to load this file. \quit + ALTER EXTENSION dblink ADD function dblink_connect(text); ALTER EXTENSION dblink ADD function dblink_connect(text,text); ALTER EXTENSION dblink ADD function dblink_connect_u(text); |