From d153b801611f6fdc58c7941e85dddb0cb25ca4ef Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 25 Aug 2014 18:30:37 +0200
Subject: [PATCH] Fix typos in some error messages thrown by extension scripts
 when fed to psql.

Some of the many error messages introduced in 458857cc missed 'FROM
unpackaged'. Also e016b724 and 45ffeb7e forgot to quote extension
version numbers.

Backpatch to 9.1, just like 458857cc which introduced the messages. Do
so because the error messages thrown when the wrong command is copy &
pasted aren't easy to understand.
---
 contrib/btree_gin/btree_gin--unpackaged--1.0.sql                | 2 +-
 contrib/btree_gist/btree_gist--unpackaged--1.0.sql              | 2 +-
 contrib/chkpass/chkpass--unpackaged--1.0.sql                    | 2 +-
 contrib/citext/citext--unpackaged--1.0.sql                      | 2 +-
 contrib/cube/cube--unpackaged--1.0.sql                          | 2 +-
 contrib/dblink/dblink--unpackaged--1.0.sql                      | 2 +-
 contrib/dict_int/dict_int--unpackaged--1.0.sql                  | 2 +-
 contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql                | 2 +-
 contrib/earthdistance/earthdistance--unpackaged--1.0.sql        | 2 +-
 contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql        | 2 +-
 contrib/hstore/hstore--unpackaged--1.0.sql                      | 2 +-
 contrib/intagg/intagg--unpackaged--1.0.sql                      | 2 +-
 contrib/intarray/intarray--unpackaged--1.0.sql                  | 2 +-
 contrib/isn/isn--unpackaged--1.0.sql                            | 2 +-
 contrib/lo/lo--unpackaged--1.0.sql                              | 2 +-
 contrib/ltree/ltree--unpackaged--1.0.sql                        | 2 +-
 contrib/pageinspect/pageinspect--1.0--1.1.sql                   | 2 +-
 contrib/pageinspect/pageinspect--1.1--1.2.sql                   | 2 +-
 contrib/pageinspect/pageinspect--unpackaged--1.0.sql            | 2 +-
 contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql      | 2 +-
 contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql    | 2 +-
 .../pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql  | 2 +-
 contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql                    | 2 +-
 contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql                  | 2 +-
 contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql              | 2 +-
 contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql            | 2 +-
 contrib/seg/seg--unpackaged--1.0.sql                            | 2 +-
 contrib/spi/autoinc--unpackaged--1.0.sql                        | 2 +-
 contrib/spi/insert_username--unpackaged--1.0.sql                | 2 +-
 contrib/spi/moddatetime--unpackaged--1.0.sql                    | 2 +-
 contrib/spi/refint--unpackaged--1.0.sql                         | 2 +-
 contrib/spi/timetravel--unpackaged--1.0.sql                     | 2 +-
 contrib/sslinfo/sslinfo--unpackaged--1.0.sql                    | 2 +-
 contrib/tablefunc/tablefunc--unpackaged--1.0.sql                | 2 +-
 contrib/test_parser/test_parser--unpackaged--1.0.sql            | 2 +-
 contrib/tsearch2/tsearch2--unpackaged--1.0.sql                  | 2 +-
 contrib/unaccent/unaccent--unpackaged--1.0.sql                  | 2 +-
 contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql                | 2 +-
 contrib/xml2/xml2--unpackaged--1.0.sql                          | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
index 8dfafc1e8b..3dae2dd38f 100644
--- a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
+++ b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION btree_gin FROM unpackaged" 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);
diff --git a/contrib/btree_gist/btree_gist--unpackaged--1.0.sql b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
index 838ad7ec1e..e9913ab7f2 100644
--- a/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
+++ b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION btree_gist FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION btree_gist ADD type gbtreekey4;
 ALTER EXTENSION btree_gist ADD function gbtreekey4_in(cstring);
diff --git a/contrib/chkpass/chkpass--unpackaged--1.0.sql b/contrib/chkpass/chkpass--unpackaged--1.0.sql
index 7bbfb142a6..8bdecddfa5 100644
--- a/contrib/chkpass/chkpass--unpackaged--1.0.sql
+++ b/contrib/chkpass/chkpass--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION chkpass FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION chkpass ADD type chkpass;
 ALTER EXTENSION chkpass ADD function chkpass_in(cstring);
diff --git a/contrib/citext/citext--unpackaged--1.0.sql b/contrib/citext/citext--unpackaged--1.0.sql
index 102743c528..b20d170b65 100644
--- a/contrib/citext/citext--unpackaged--1.0.sql
+++ b/contrib/citext/citext--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION citext FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION citext ADD type citext;
 ALTER EXTENSION citext ADD function citextin(cstring);
diff --git a/contrib/cube/cube--unpackaged--1.0.sql b/contrib/cube/cube--unpackaged--1.0.sql
index 6859682786..1065512a29 100644
--- a/contrib/cube/cube--unpackaged--1.0.sql
+++ b/contrib/cube/cube--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION cube FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION cube ADD type cube;
 ALTER EXTENSION cube ADD function cube_in(cstring);
diff --git a/contrib/dblink/dblink--unpackaged--1.0.sql b/contrib/dblink/dblink--unpackaged--1.0.sql
index 29f5bed0c1..f3923b5b35 100644
--- a/contrib/dblink/dblink--unpackaged--1.0.sql
+++ b/contrib/dblink/dblink--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION dblink FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION dblink ADD function dblink_connect(text);
 ALTER EXTENSION dblink ADD function dblink_connect(text,text);
diff --git a/contrib/dict_int/dict_int--unpackaged--1.0.sql b/contrib/dict_int/dict_int--unpackaged--1.0.sql
index ef59b046ee..1b2d862e1f 100644
--- a/contrib/dict_int/dict_int--unpackaged--1.0.sql
+++ b/contrib/dict_int/dict_int--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION dict_int FROM unpackaged" 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);
diff --git a/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
index 1d193f7981..7533da1902 100644
--- a/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
+++ b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION dict_xsyn FROM unpackaged" 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);
diff --git a/contrib/earthdistance/earthdistance--unpackaged--1.0.sql b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
index 362e0ac107..ae787f6877 100644
--- a/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
+++ b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION earthdistance FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION earthdistance ADD function earth();
 ALTER EXTENSION earthdistance ADD type earth;
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
index b9a805a4fe..14491a9fa7 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
+++ b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION fuzzystrmatch FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text);
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text,integer,integer,integer);
diff --git a/contrib/hstore/hstore--unpackaged--1.0.sql b/contrib/hstore/hstore--unpackaged--1.0.sql
index b7e73f4123..19a7802805 100644
--- a/contrib/hstore/hstore--unpackaged--1.0.sql
+++ b/contrib/hstore/hstore--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION hstore FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION hstore ADD type hstore;
 ALTER EXTENSION hstore ADD function hstore_in(cstring);
diff --git a/contrib/intagg/intagg--unpackaged--1.0.sql b/contrib/intagg/intagg--unpackaged--1.0.sql
index 6a6663d092..a0b13f3f69 100644
--- a/contrib/intagg/intagg--unpackaged--1.0.sql
+++ b/contrib/intagg/intagg--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION intagg FROM unpackaged" 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);
diff --git a/contrib/intarray/intarray--unpackaged--1.0.sql b/contrib/intarray/intarray--unpackaged--1.0.sql
index 5de64bf0ab..63814cef98 100644
--- a/contrib/intarray/intarray--unpackaged--1.0.sql
+++ b/contrib/intarray/intarray--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION intarray FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION intarray ADD type query_int;
 ALTER EXTENSION intarray ADD function bqarr_in(cstring);
diff --git a/contrib/isn/isn--unpackaged--1.0.sql b/contrib/isn/isn--unpackaged--1.0.sql
index 30e5012156..8a19d6a475 100644
--- a/contrib/isn/isn--unpackaged--1.0.sql
+++ b/contrib/isn/isn--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION isn FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION isn ADD type ean13;
 ALTER EXTENSION isn ADD function ean13_in(cstring);
diff --git a/contrib/lo/lo--unpackaged--1.0.sql b/contrib/lo/lo--unpackaged--1.0.sql
index 053185ba1d..d6bcf1a46e 100644
--- a/contrib/lo/lo--unpackaged--1.0.sql
+++ b/contrib/lo/lo--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION lo FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION lo ADD domain lo;
 ALTER EXTENSION lo ADD function lo_oid(lo);
diff --git a/contrib/ltree/ltree--unpackaged--1.0.sql b/contrib/ltree/ltree--unpackaged--1.0.sql
index 1e24fa56c6..30a94c2fc5 100644
--- a/contrib/ltree/ltree--unpackaged--1.0.sql
+++ b/contrib/ltree/ltree--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION ltree FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION ltree ADD type ltree;
 ALTER EXTENSION ltree ADD function ltree_in(cstring);
diff --git a/contrib/pageinspect/pageinspect--1.0--1.1.sql b/contrib/pageinspect/pageinspect--1.0--1.1.sql
index 49e83264d3..0e2c3f45b3 100644
--- a/contrib/pageinspect/pageinspect--1.0--1.1.sql
+++ b/contrib/pageinspect/pageinspect--1.0--1.1.sql
@@ -1,7 +1,7 @@
 /* contrib/pageinspect/pageinspect--1.0--1.1.sql */
 
 -- complain if script is sourced in psql, rather than via ALTER EXTENSION
-\echo Use "ALTER EXTENSION pageinspect UPDATE TO 1.1" to load this file. \quit
+\echo Use "ALTER EXTENSION pageinspect UPDATE TO '1.1'" to load this file. \quit
 
 DROP FUNCTION page_header(bytea);
 CREATE FUNCTION page_header(IN page bytea,
diff --git a/contrib/pageinspect/pageinspect--1.1--1.2.sql b/contrib/pageinspect/pageinspect--1.1--1.2.sql
index 5e23ca4dd5..31ffbb0eb5 100644
--- a/contrib/pageinspect/pageinspect--1.1--1.2.sql
+++ b/contrib/pageinspect/pageinspect--1.1--1.2.sql
@@ -1,7 +1,7 @@
 /* contrib/pageinspect/pageinspect--1.1--1.2.sql */
 
 -- complain if script is sourced in psql, rather than via ALTER EXTENSION
-\echo Use "ALTER EXTENSION pageinspect UPDATE TO 1.2" to load this file. \quit
+\echo Use "ALTER EXTENSION pageinspect UPDATE TO '1.2'" to load this file. \quit
 
 DROP FUNCTION page_header(bytea);
 CREATE FUNCTION page_header(IN page bytea,
diff --git a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
index 13e2167dfc..1bf6bccb79 100644
--- a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
+++ b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION pageinspect FROM unpackaged" to load this file. \quit
 
 DROP FUNCTION heap_page_items(bytea);
 CREATE FUNCTION heap_page_items(IN page bytea,
diff --git a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
index bfe6e52f8f..dc1cbdd6fe 100644
--- a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
+++ b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
@@ -1,7 +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
+\echo Use "CREATE EXTENSION pg_buffercache FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pg_buffercache ADD function pg_buffercache_pages();
 ALTER EXTENSION pg_buffercache ADD view pg_buffercache;
diff --git a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
index 5e8d7e472e..8651373800 100644
--- a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
+++ b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
@@ -1,7 +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
+\echo Use "CREATE EXTENSION pg_freespacemap FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass,bigint);
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass);
diff --git a/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
index e84a3cbafc..116e95834d 100644
--- a/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
+++ b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION pg_stat_statements FROM unpackaged" 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();
diff --git a/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
index 7243a6a410..d3eab97d41 100644
--- a/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
+++ b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION pg_trgm FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pg_trgm ADD function set_limit(real);
 ALTER EXTENSION pg_trgm ADD function show_limit();
diff --git a/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
index fe8d4c4e72..8154e85f44 100644
--- a/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
+++ b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pgcrypto" to load this file. \quit
+\echo Use "CREATE EXTENSION pgcrypto FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pgcrypto ADD function digest(text,text);
 ALTER EXTENSION pgcrypto ADD function digest(bytea,text);
diff --git a/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
index b8c3faf1c7..bfa9855825 100644
--- a/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
+++ b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pgrowlocks" to load this file. \quit
+\echo Use "CREATE EXTENSION pgrowlocks FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pgrowlocks ADD function pgrowlocks(text);
diff --git a/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
index 14b63cafcf..ef71000a32 100644
--- a/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
+++ b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pgstattuple" to load this file. \quit
+\echo Use "CREATE EXTENSION pgstattuple FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION pgstattuple ADD function pgstattuple(text);
 ALTER EXTENSION pgstattuple ADD function pgstattuple(oid);
diff --git a/contrib/seg/seg--unpackaged--1.0.sql b/contrib/seg/seg--unpackaged--1.0.sql
index ebd6b3bc5b..3987ebf3dd 100644
--- a/contrib/seg/seg--unpackaged--1.0.sql
+++ b/contrib/seg/seg--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/seg/seg--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION seg" to load this file. \quit
+\echo Use "CREATE EXTENSION seg FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION seg ADD type seg;
 ALTER EXTENSION seg ADD function seg_in(cstring);
diff --git a/contrib/spi/autoinc--unpackaged--1.0.sql b/contrib/spi/autoinc--unpackaged--1.0.sql
index cfe2065d3d..e5289e834f 100644
--- a/contrib/spi/autoinc--unpackaged--1.0.sql
+++ b/contrib/spi/autoinc--unpackaged--1.0.sql
@@ -1,6 +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
+\echo Use "CREATE EXTENSION autoinc FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION autoinc ADD function autoinc();
diff --git a/contrib/spi/insert_username--unpackaged--1.0.sql b/contrib/spi/insert_username--unpackaged--1.0.sql
index 91a5d1f309..eb26ba0bd1 100644
--- a/contrib/spi/insert_username--unpackaged--1.0.sql
+++ b/contrib/spi/insert_username--unpackaged--1.0.sql
@@ -1,6 +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
+\echo Use "CREATE EXTENSION insert_username FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION insert_username ADD function insert_username();
diff --git a/contrib/spi/moddatetime--unpackaged--1.0.sql b/contrib/spi/moddatetime--unpackaged--1.0.sql
index caa49ce0dc..c681fa7ed9 100644
--- a/contrib/spi/moddatetime--unpackaged--1.0.sql
+++ b/contrib/spi/moddatetime--unpackaged--1.0.sql
@@ -1,6 +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
+\echo Use "CREATE EXTENSION moddatetime FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION moddatetime ADD function moddatetime();
diff --git a/contrib/spi/refint--unpackaged--1.0.sql b/contrib/spi/refint--unpackaged--1.0.sql
index cd9c9b0c36..461ed157c3 100644
--- a/contrib/spi/refint--unpackaged--1.0.sql
+++ b/contrib/spi/refint--unpackaged--1.0.sql
@@ -1,7 +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
+\echo Use "CREATE EXTENSION refint FROM unpackaged" 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--unpackaged--1.0.sql b/contrib/spi/timetravel--unpackaged--1.0.sql
index dd07a133a5..121bceba9b 100644
--- a/contrib/spi/timetravel--unpackaged--1.0.sql
+++ b/contrib/spi/timetravel--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use "CREATE EXTENSION timetravel FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION timetravel ADD function timetravel();
 ALTER EXTENSION timetravel ADD function set_timetravel(name,integer);
diff --git a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
index e4b868423b..07407acb54 100644
--- a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
+++ b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/sslinfo/sslinfo--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION sslinfo" to load this file. \quit
+\echo Use "CREATE EXTENSION sslinfo FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION sslinfo ADD function ssl_client_serial();
 ALTER EXTENSION sslinfo ADD function ssl_is_used();
diff --git a/contrib/tablefunc/tablefunc--unpackaged--1.0.sql b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
index e5e9619c52..f0a276a9c4 100644
--- a/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
+++ b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/tablefunc/tablefunc--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION tablefunc" to load this file. \quit
+\echo Use "CREATE EXTENSION tablefunc FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION tablefunc ADD function normal_rand(integer,double precision,double precision);
 ALTER EXTENSION tablefunc ADD function crosstab(text);
diff --git a/contrib/test_parser/test_parser--unpackaged--1.0.sql b/contrib/test_parser/test_parser--unpackaged--1.0.sql
index 34120f2346..62458bd2c6 100644
--- a/contrib/test_parser/test_parser--unpackaged--1.0.sql
+++ b/contrib/test_parser/test_parser--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/test_parser/test_parser--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION test_parser" to load this file. \quit
+\echo Use "CREATE EXTENSION test_parser FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION test_parser ADD function testprs_start(internal,integer);
 ALTER EXTENSION test_parser ADD function testprs_getlexeme(internal,internal,internal);
diff --git a/contrib/tsearch2/tsearch2--unpackaged--1.0.sql b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
index af970a4862..e123297132 100644
--- a/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
+++ b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/tsearch2/tsearch2--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION tsearch2" to load this file. \quit
+\echo Use "CREATE EXTENSION tsearch2 FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION tsearch2 ADD type @extschema@.tsvector;
 ALTER EXTENSION tsearch2 ADD type @extschema@.tsquery;
diff --git a/contrib/unaccent/unaccent--unpackaged--1.0.sql b/contrib/unaccent/unaccent--unpackaged--1.0.sql
index abd06983ac..f3fb5d8760 100644
--- a/contrib/unaccent/unaccent--unpackaged--1.0.sql
+++ b/contrib/unaccent/unaccent--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/unaccent/unaccent--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION unaccent" to load this file. \quit
+\echo Use "CREATE EXTENSION unaccent FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION unaccent ADD function unaccent(regdictionary,text);
 ALTER EXTENSION unaccent ADD function unaccent(text);
diff --git a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
index 5776b6f930..444c5c7cef 100644
--- a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
+++ b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* 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
+\echo Use '''CREATE EXTENSION "uuid-ossp" FROM unpackaged''' to load this file. \quit
 
 ALTER EXTENSION "uuid-ossp" ADD function uuid_nil();
 ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_dns();
diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql
index b02dabffc2..8badef3079 100644
--- a/contrib/xml2/xml2--unpackaged--1.0.sql
+++ b/contrib/xml2/xml2--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/xml2/xml2--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION xml2" to load this file. \quit
+\echo Use "CREATE EXTENSION xml2 FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION xml2 ADD function xslt_process(text,text);
 ALTER EXTENSION xml2 ADD function xslt_process(text,text,text);