mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
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.
This commit is contained in:
@ -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'
|
||||
|
@ -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();
|
||||
|
@ -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'
|
||||
|
@ -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();
|
||||
|
@ -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'
|
||||
|
@ -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();
|
||||
|
@ -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'
|
||||
|
@ -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();
|
||||
|
@ -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'
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user