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/spi | |
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/spi')
-rw-r--r-- | contrib/spi/autoinc--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/autoinc--unpackaged--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/insert_username--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/insert_username--unpackaged--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/moddatetime--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/moddatetime--unpackaged--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/refint--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/refint--unpackaged--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/timetravel--1.0.sql | 3 | ||||
-rw-r--r-- | contrib/spi/timetravel--unpackaged--1.0.sql | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/contrib/spi/autoinc--1.0.sql b/contrib/spi/autoinc--1.0.sql index 9c9df9ce0b..22721e003d 100644 --- a/contrib/spi/autoinc--1.0.sql +++ b/contrib/spi/autoinc--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/autoinc--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION autoinc" to load this file. \quit + CREATE FUNCTION autoinc() RETURNS trigger AS 'MODULE_PATHNAME' diff --git a/contrib/spi/autoinc--unpackaged--1.0.sql b/contrib/spi/autoinc--unpackaged--1.0.sql index 232e9170fc..cfe2065d3d 100644 --- a/contrib/spi/autoinc--unpackaged--1.0.sql +++ b/contrib/spi/autoinc--unpackaged--1.0.sql @@ -1,3 +1,6 @@ /* contrib/spi/autoinc--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION autoinc" to load this file. \quit + ALTER EXTENSION autoinc ADD function autoinc(); diff --git a/contrib/spi/insert_username--1.0.sql b/contrib/spi/insert_username--1.0.sql index bd854587e0..0deb0bf3f8 100644 --- a/contrib/spi/insert_username--1.0.sql +++ b/contrib/spi/insert_username--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/insert_username--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION insert_username" to load this file. \quit + CREATE FUNCTION insert_username() RETURNS trigger AS 'MODULE_PATHNAME' diff --git a/contrib/spi/insert_username--unpackaged--1.0.sql b/contrib/spi/insert_username--unpackaged--1.0.sql index f53cb690f1..91a5d1f309 100644 --- a/contrib/spi/insert_username--unpackaged--1.0.sql +++ b/contrib/spi/insert_username--unpackaged--1.0.sql @@ -1,3 +1,6 @@ /* contrib/spi/insert_username--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION insert_username" to load this file. \quit + ALTER EXTENSION insert_username ADD function insert_username(); diff --git a/contrib/spi/moddatetime--1.0.sql b/contrib/spi/moddatetime--1.0.sql index 97cc63289f..2ee61b814f 100644 --- a/contrib/spi/moddatetime--1.0.sql +++ b/contrib/spi/moddatetime--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/moddatetime--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION moddatetime" to load this file. \quit + CREATE FUNCTION moddatetime() RETURNS trigger AS 'MODULE_PATHNAME' diff --git a/contrib/spi/moddatetime--unpackaged--1.0.sql b/contrib/spi/moddatetime--unpackaged--1.0.sql index f3a0a96837..caa49ce0dc 100644 --- a/contrib/spi/moddatetime--unpackaged--1.0.sql +++ b/contrib/spi/moddatetime--unpackaged--1.0.sql @@ -1,3 +1,6 @@ /* contrib/spi/moddatetime--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION moddatetime" to load this file. \quit + ALTER EXTENSION moddatetime ADD function moddatetime(); diff --git a/contrib/spi/refint--1.0.sql b/contrib/spi/refint--1.0.sql index 9e5d931df5..faf797c215 100644 --- a/contrib/spi/refint--1.0.sql +++ b/contrib/spi/refint--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/refint--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION refint" to load this file. \quit + CREATE FUNCTION check_primary_key() RETURNS trigger AS 'MODULE_PATHNAME' diff --git a/contrib/spi/refint--unpackaged--1.0.sql b/contrib/spi/refint--unpackaged--1.0.sql index 54fece055a..cd9c9b0c36 100644 --- a/contrib/spi/refint--unpackaged--1.0.sql +++ b/contrib/spi/refint--unpackaged--1.0.sql @@ -1,4 +1,7 @@ /* contrib/spi/refint--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION refint" to load this file. \quit + ALTER EXTENSION refint ADD function check_primary_key(); ALTER EXTENSION refint ADD function check_foreign_key(); diff --git a/contrib/spi/timetravel--1.0.sql b/contrib/spi/timetravel--1.0.sql index b68cf2f247..c34ca09965 100644 --- a/contrib/spi/timetravel--1.0.sql +++ b/contrib/spi/timetravel--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/timetravel--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION timetravel" to load this file. \quit + CREATE FUNCTION timetravel() RETURNS trigger AS 'MODULE_PATHNAME' diff --git a/contrib/spi/timetravel--unpackaged--1.0.sql b/contrib/spi/timetravel--unpackaged--1.0.sql index e3716afe95..dd07a133a5 100644 --- a/contrib/spi/timetravel--unpackaged--1.0.sql +++ b/contrib/spi/timetravel--unpackaged--1.0.sql @@ -1,5 +1,8 @@ /* contrib/spi/timetravel--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION timetravel" to load this file. \quit + ALTER EXTENSION timetravel ADD function timetravel(); ALTER EXTENSION timetravel ADD function set_timetravel(name,integer); ALTER EXTENSION timetravel ADD function get_timetravel(name); |