From 458857cc9d7d00711b272a0dabbcb591b506d6b8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 12 Oct 2011 15:45:03 -0400 Subject: 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. --- contrib/uuid-ossp/uuid-ossp--1.0.sql | 3 +++ contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql | 3 +++ 2 files changed, 6 insertions(+) (limited to 'contrib/uuid-ossp') diff --git a/contrib/uuid-ossp/uuid-ossp--1.0.sql b/contrib/uuid-ossp/uuid-ossp--1.0.sql index 43ae0b38a0..45ada1b23b 100644 --- a/contrib/uuid-ossp/uuid-ossp--1.0.sql +++ b/contrib/uuid-ossp/uuid-ossp--1.0.sql @@ -1,5 +1,8 @@ /* contrib/uuid-ossp/uuid-ossp--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION uuid-ossp" to load this file. \quit + CREATE FUNCTION uuid_nil() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_nil' diff --git a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql index bc984dd8c0..5c0dbfef9c 100644 --- a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql +++ b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql @@ -1,5 +1,8 @@ /* contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql */ +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION uuid-ossp" to load this file. \quit + ALTER EXTENSION "uuid-ossp" ADD function uuid_nil(); ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_dns(); ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_url(); -- cgit v1.2.1