diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-06-14 10:47:06 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-06-14 10:47:06 -0400 |
| commit | 5484c0a9806b3e90b483128bc386054fc432cb65 (patch) | |
| tree | 224c0f56a22beea695544e8ba31d5a30939197cd /contrib/hstore_plpython | |
| parent | 332fdbef20b5b5f2588447793dbcc3bb9b88eb51 (diff) | |
| download | postgresql-5484c0a9806b3e90b483128bc386054fc432cb65.tar.gz postgresql-5484c0a9806b3e90b483128bc386054fc432cb65.zip | |
Minor fixes in contrib installation scripts.
Extension scripts should never use CREATE OR REPLACE for initial object
creation. If there is a collision with a pre-existing (probably
user-created) object, we want extension installation to fail, not silently
overwrite the user's object. Bloom and sslinfo both violated this precept.
Also fix a number of scripts that had no standard header (the file name
comment and the \echo...\quit guard). Probably the \echo...\quit hack
is less important now than it was in 9.1 days, but that doesn't mean
that individual extensions get to choose whether to use it or not.
And fix a couple of evident copy-and-pasteos in file name comments.
No need for back-patch: the REPLACE bugs are both new in 9.6, and the
rest of this is pretty much cosmetic.
Andreas Karlsson and Tom Lane
Diffstat (limited to 'contrib/hstore_plpython')
| -rw-r--r-- | contrib/hstore_plpython/hstore_plpython2u--1.0.sql | 5 | ||||
| -rw-r--r-- | contrib/hstore_plpython/hstore_plpython3u--1.0.sql | 5 | ||||
| -rw-r--r-- | contrib/hstore_plpython/hstore_plpythonu--1.0.sql | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/contrib/hstore_plpython/hstore_plpython2u--1.0.sql b/contrib/hstore_plpython/hstore_plpython2u--1.0.sql index a793dc9c0cd..e3aea6399e9 100644 --- a/contrib/hstore_plpython/hstore_plpython2u--1.0.sql +++ b/contrib/hstore_plpython/hstore_plpython2u--1.0.sql @@ -1,3 +1,8 @@ +/* contrib/hstore_plpython/hstore_plpython2u--1.0.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION hstore_plpython2u" to load this file. \quit + -- make sure the prerequisite libraries are loaded LOAD 'plpython2'; SELECT NULL::hstore; diff --git a/contrib/hstore_plpython/hstore_plpython3u--1.0.sql b/contrib/hstore_plpython/hstore_plpython3u--1.0.sql index a85c85d4c1b..a964a49059a 100644 --- a/contrib/hstore_plpython/hstore_plpython3u--1.0.sql +++ b/contrib/hstore_plpython/hstore_plpython3u--1.0.sql @@ -1,3 +1,8 @@ +/* contrib/hstore_plpython/hstore_plpython3u--1.0.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION hstore_plpython3u" to load this file. \quit + -- make sure the prerequisite libraries are loaded LOAD 'plpython3'; SELECT NULL::hstore; diff --git a/contrib/hstore_plpython/hstore_plpythonu--1.0.sql b/contrib/hstore_plpython/hstore_plpythonu--1.0.sql index e2e4721dca9..d79bdc96d99 100644 --- a/contrib/hstore_plpython/hstore_plpythonu--1.0.sql +++ b/contrib/hstore_plpython/hstore_plpythonu--1.0.sql @@ -1,3 +1,8 @@ +/* contrib/hstore_plpython/hstore_plpythonu--1.0.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION hstore_plpythonu" to load this file. \quit + -- make sure the prerequisite libraries are loaded LOAD 'plpython2'; -- change to plpython3 if that ever becomes the default SELECT NULL::hstore; |