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:36 -0400 |
commit | dbd35a972fabba2ed723ac9ab4c4236ab2bd271d (patch) | |
tree | c771a526f22e700718a736bc99fd3f9a27f015e6 /contrib/intarray | |
parent | ecd9de637b165458832ecf3b541a0cb5fdca478e (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/intarray')
-rw-r--r-- | contrib/intarray/intarray--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/intarray/intarray--unpackaged--1.0.sql | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/contrib/intarray/intarray--1.0.sql b/contrib/intarray/intarray--1.0.sql index 3b77c516cbc..0b89e0f55e5 100644 --- a/contrib/intarray/intarray--1.0.sql +++ b/contrib/intarray/intarray--1.0.sql @@ -1,5 +1,8 @@ /* contrib/intarray/intarray--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION intarray" to load this file. \quit + -- -- Create the user-defined type for the 1-D integer arrays (_int4) -- diff --git a/contrib/intarray/intarray--unpackaged--1.0.sql b/contrib/intarray/intarray--unpackaged--1.0.sql index 5a2829c9f53..5de64bf0aba 100644 --- a/contrib/intarray/intarray--unpackaged--1.0.sql +++ b/contrib/intarray/intarray--unpackaged--1.0.sql @@ -1,5 +1,8 @@ /* contrib/intarray/intarray--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION intarray" to load this file. \quit + ALTER EXTENSION intarray ADD type query_int; ALTER EXTENSION intarray ADD function bqarr_in(cstring); ALTER EXTENSION intarray ADD function bqarr_out(query_int); |