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.

Author: tglsfdc

contrib/adminpack/adminpack--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/adminpack/adminpack--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION adminpack" to load this file. \quit
+
 /* ***********************************************
  * Administrative functions for PostgreSQL
  * *********************************************** */

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'

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);

contrib/btree_gist/btree_gist--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/btree_gist/btree_gist--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gist" to load this file. \quit
+
 CREATE FUNCTION gbtreekey4_in(cstring)
 RETURNS gbtreekey4
 AS 'MODULE_PATHNAME', 'gbtreekey_in'

contrib/btree_gist/btree_gist--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/btree_gist/btree_gist--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gist" to load this file. \quit
+
 ALTER EXTENSION btree_gist ADD type gbtreekey4;
 ALTER EXTENSION btree_gist ADD function gbtreekey4_in(cstring);
 ALTER EXTENSION btree_gist ADD function gbtreekey4_out(gbtreekey4);

contrib/chkpass/chkpass--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/chkpass/chkpass--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION chkpass" to load this file. \quit
+
 --
 --	Input and output functions and the type itself:
 --

contrib/chkpass/chkpass--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/chkpass/chkpass--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION chkpass" to load this file. \quit
+
 ALTER EXTENSION chkpass ADD type chkpass;
 ALTER EXTENSION chkpass ADD function chkpass_in(cstring);
 ALTER EXTENSION chkpass ADD function chkpass_out(chkpass);

contrib/citext/citext--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/citext/citext--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION citext" to load this file. \quit
+
 --
 --  PostgreSQL code for CITEXT.
 --

contrib/citext/citext--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/citext/citext--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION citext" to load this file. \quit
+
 ALTER EXTENSION citext ADD type citext;
 ALTER EXTENSION citext ADD function citextin(cstring);
 ALTER EXTENSION citext ADD function citextout(citext);

contrib/cube/cube--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/cube/cube--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cube" to load this file. \quit
+
 -- Create the user-defined type for N-dimensional boxes
 
 CREATE FUNCTION cube_in(cstring)

contrib/cube/cube--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/cube/cube--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cube" to load this file. \quit
+
 ALTER EXTENSION cube ADD type cube;
 ALTER EXTENSION cube ADD function cube_in(cstring);
 ALTER EXTENSION cube ADD function cube(double precision[],double precision[]);

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)

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);

contrib/dict_int/dict_int--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/dict_int/dict_int--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_int" to load this file. \quit
+
 CREATE FUNCTION dintdict_init(internal)
         RETURNS internal
         AS 'MODULE_PATHNAME'

contrib/dict_int/dict_int--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/dict_int/dict_int--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_int" to load this file. \quit
+
 ALTER EXTENSION dict_int ADD function dintdict_init(internal);
 ALTER EXTENSION dict_int ADD function dintdict_lexize(internal,internal,internal,internal);
 ALTER EXTENSION dict_int ADD text search template intdict_template;

contrib/dict_xsyn/dict_xsyn--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/dict_xsyn/dict_xsyn--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_xsyn" to load this file. \quit
+
 CREATE FUNCTION dxsyn_init(internal)
         RETURNS internal
         AS 'MODULE_PATHNAME'

contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_xsyn" to load this file. \quit
+
 ALTER EXTENSION dict_xsyn ADD function dxsyn_init(internal);
 ALTER EXTENSION dict_xsyn ADD function dxsyn_lexize(internal,internal,internal,internal);
 ALTER EXTENSION dict_xsyn ADD text search template xsyn_template;

contrib/earthdistance/earthdistance--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/earthdistance/earthdistance--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION earthdistance" to load this file. \quit
+
 -- earth() returns the radius of the earth in meters. This is the only
 -- place you need to change things for the cube base distance functions
 -- in order to use different units (or a better value for the Earth's radius).

contrib/earthdistance/earthdistance--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/earthdistance/earthdistance--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION earthdistance" to load this file. \quit
+
 ALTER EXTENSION earthdistance ADD function earth();
 ALTER EXTENSION earthdistance ADD type earth;
 ALTER EXTENSION earthdistance ADD function sec_to_gc(double precision);

contrib/file_fdw/file_fdw--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/file_fdw/file_fdw--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION file_fdw" to load this file. \quit
+
 CREATE FUNCTION file_fdw_handler()
 RETURNS fdw_handler
 AS 'MODULE_PATHNAME'

contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION fuzzystrmatch" to load this file. \quit
+
 CREATE FUNCTION levenshtein (text,text) RETURNS int
 AS 'MODULE_PATHNAME','levenshtein'
 LANGUAGE C IMMUTABLE STRICT;

contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION fuzzystrmatch" to load this file. \quit
+
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text);
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text,integer,integer,integer);
 ALTER EXTENSION fuzzystrmatch ADD function metaphone(text,integer);

contrib/hstore/hstore--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/hstore/hstore--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION hstore" to load this file. \quit
+
 CREATE TYPE hstore;
 
 CREATE FUNCTION hstore_in(cstring)

contrib/hstore/hstore--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/hstore/hstore--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION hstore" to load this file. \quit
+
 ALTER EXTENSION hstore ADD type hstore;
 ALTER EXTENSION hstore ADD function hstore_in(cstring);
 ALTER EXTENSION hstore ADD function hstore_out(hstore);

contrib/intagg/intagg--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/intagg/intagg--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intagg" to load this file. \quit
+
 -- Internal function for the aggregate
 -- Is called for each item in an aggregation
 CREATE FUNCTION int_agg_state (internal, int4)

contrib/intagg/intagg--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/intagg/intagg--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intagg" to load this file. \quit
+
 ALTER EXTENSION intagg ADD function int_agg_state(internal,integer);
 ALTER EXTENSION intagg ADD function int_agg_final_array(internal);
 ALTER EXTENSION intagg ADD function int_array_aggregate(integer);

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)
 --

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);

contrib/isn/isn--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/isn/isn--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION isn" to load this file. \quit
+
 -- Example:
 --   create table test ( id isbn );
 --   insert into test values('978-0-393-04002-9');

contrib/isn/isn--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/isn/isn--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION isn" to load this file. \quit
+
 ALTER EXTENSION isn ADD type ean13;
 ALTER EXTENSION isn ADD function ean13_in(cstring);
 ALTER EXTENSION isn ADD function ean13_out(ean13);

contrib/lo/lo--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/lo/lo--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION lo" to load this file. \quit
+
 --
 --	Create the data type ... now just a domain over OID
 --

contrib/lo/lo--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/lo/lo--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION lo" to load this file. \quit
+
 ALTER EXTENSION lo ADD domain lo;
 ALTER EXTENSION lo ADD function lo_oid(lo);
 ALTER EXTENSION lo ADD function lo_manage();

contrib/ltree/ltree--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/ltree/ltree--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION ltree" to load this file. \quit
+
 CREATE FUNCTION ltree_in(cstring)
 RETURNS ltree
 AS 'MODULE_PATHNAME'

contrib/ltree/ltree--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/ltree/ltree--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION ltree" to load this file. \quit
+
 ALTER EXTENSION ltree ADD type ltree;
 ALTER EXTENSION ltree ADD function ltree_in(cstring);
 ALTER EXTENSION ltree ADD function ltree_out(ltree);

contrib/pageinspect/pageinspect--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pageinspect/pageinspect--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pageinspect" to load this file. \quit
+
 --
 -- get_raw_page()
 --

contrib/pageinspect/pageinspect--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pageinspect/pageinspect--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pageinspect" to load this file. \quit
+
 DROP FUNCTION heap_page_items(bytea);
 CREATE FUNCTION heap_page_items(IN page bytea,
 	OUT lp smallint,

contrib/pg_buffercache/pg_buffercache--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_buffercache/pg_buffercache--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit
+
 -- Register the function.
 CREATE FUNCTION pg_buffercache_pages()
 RETURNS SETOF RECORD

contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql

@@ -1,4 +1,7 @@
 /* contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit
+
 ALTER EXTENSION pg_buffercache ADD function pg_buffercache_pages();
 ALTER EXTENSION pg_buffercache ADD view pg_buffercache;

contrib/pg_freespacemap/pg_freespacemap--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_freespacemap/pg_freespacemap--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_freespacemap" to load this file. \quit
+
 -- Register the C function.
 CREATE FUNCTION pg_freespace(regclass, bigint)
 RETURNS int2

contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql

@@ -1,4 +1,7 @@
 /* contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_freespacemap" to load this file. \quit
+
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass,bigint);
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass);

contrib/pg_stat_statements/pg_stat_statements--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_stat_statements/pg_stat_statements--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_stat_statements" to load this file. \quit
+
 -- Register functions.
 CREATE FUNCTION pg_stat_statements_reset()
 RETURNS void

contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_stat_statements" to load this file. \quit
+
 ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements_reset();
 ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements();
 ALTER EXTENSION pg_stat_statements ADD view pg_stat_statements;

contrib/pg_trgm/pg_trgm--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_trgm/pg_trgm--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit
+
 CREATE FUNCTION set_limit(float4)
 RETURNS float4
 AS 'MODULE_PATHNAME'

contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql

@@ -1,5 +1,8 @@
 /* contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit
+
 ALTER EXTENSION pg_trgm ADD function set_limit(real);
 ALTER EXTENSION pg_trgm ADD function show_limit();
 ALTER EXTENSION pg_trgm ADD function show_trgm(text);