diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-10-12 15:45:03 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-10-12 15:45:03 -0400 |
| commit | 458857cc9d7d00711b272a0dabbcb591b506d6b8 (patch) | |
| tree | 2b4acca78ee2fba19273d10aa01eccc4bc111d4b /contrib/btree_gin | |
| parent | e0d273500a84ab94c69cbfa10ea0537604fbdda3 (diff) | |
| download | postgresql-458857cc9d7d00711b272a0dabbcb591b506d6b8.tar.gz | |
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/btree_gin')
| -rw-r--r-- | contrib/btree_gin/btree_gin--1.0.sql | 3 | ||||
| -rw-r--r-- | contrib/btree_gin/btree_gin--unpackaged--1.0.sql | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/contrib/btree_gin/btree_gin--1.0.sql b/contrib/btree_gin/btree_gin--1.0.sql index 07f93640f3..cf867ef687 100644 --- a/contrib/btree_gin/btree_gin--1.0.sql +++ b/contrib/btree_gin/btree_gin--1.0.sql @@ -1,5 +1,8 @@ /* contrib/btree_gin/btree_gin--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION btree_gin" to load this file. \quit + CREATE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal) RETURNS bool AS 'MODULE_PATHNAME' diff --git a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql index fe1ddeab87..8dfafc1e8b 100644 --- a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql +++ b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql @@ -1,5 +1,8 @@ /* contrib/btree_gin/btree_gin--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION btree_gin" to load this file. \quit + ALTER EXTENSION btree_gin ADD function gin_btree_consistent(internal,smallint,anyelement,integer,internal,internal); ALTER EXTENSION btree_gin ADD function gin_extract_value_int2(smallint,internal); ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int2(smallint,smallint,smallint,internal); |