From e546a03c7f309d5ea22c80fb87ccea7cffebbe29 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Sun, 13 Sep 2020 20:14:42 +0900 Subject: [PATCH] Follow the guide line of PostgreSQL 12.4 regarding extensions. CREATE OR REPLACE FUNCTION should be avoided. Use CREATE FUNCTION instead. --- src/sql/pgpool-recovery/pgpool-recovery.sql.in | 14 +++++++------- src/sql/pgpool-recovery/pgpool_recovery--1.0.sql | 4 ++-- src/sql/pgpool-recovery/pgpool_recovery--1.1.sql | 4 ++-- src/sql/pgpool-recovery/pgpool_recovery--1.2.sql | 4 ++-- src/sql/pgpool-recovery/pgpool_recovery--1.3.sql | 4 ++-- src/sql/pgpool-regclass/pgpool-regclass.sql.in | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/sql/pgpool-recovery/pgpool-recovery.sql.in b/src/sql/pgpool-recovery/pgpool-recovery.sql.in index fe72d66e2..64d3cbbd7 100644 --- a/src/sql/pgpool-recovery/pgpool-recovery.sql.in +++ b/src/sql/pgpool-recovery/pgpool-recovery.sql.in @@ -1,4 +1,4 @@ -CREATE OR REPLACE FUNCTION pgpool_recovery(IN script_name text, +CREATE FUNCTION pgpool_recovery(IN script_name text, IN remote_host text, IN remote_data_directory text, IN primary_port text, @@ -8,7 +8,7 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_recovery' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_recovery(IN script_name text, +CREATE FUNCTION pgpool_recovery(IN script_name text, IN remote_host text, IN remote_data_directory text, IN primary_port text, @@ -17,7 +17,7 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_recovery' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_recovery(IN script_name text, +CREATE FUNCTION pgpool_recovery(IN script_name text, IN remote_host text, IN remote_data_directory text, IN primary_port text) @@ -25,24 +25,24 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_recovery' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_recovery(IN script_name text, +CREATE FUNCTION pgpool_recovery(IN script_name text, IN remote_host text, IN remote_data_directory text) RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_recovery' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_remote_start(text, text) +CREATE FUNCTION pgpool_remote_start(text, text) RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_remote_start' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_pgctl(text, text) +CREATE FUNCTION pgpool_pgctl(text, text) RETURNS bool AS '$libdir/pgpool-recovery', 'pgpool_pgctl' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_switch_xlog(text) +CREATE FUNCTION pgpool_switch_xlog(text) RETURNS text AS 'MODULE_PATHNAME', 'pgpool_switch_xlog' LANGUAGE C STRICT; diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql index 183f7873c..8bacaec24 100644 --- a/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql +++ b/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql @@ -13,12 +13,12 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_remote_start' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) +CREATE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) RETURNS bool AS '$libdir/pgpool-recovery', 'pgpool_pgctl' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_switch_xlog(IN arcive_dir text) +CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text) RETURNS text AS 'MODULE_PATHNAME', 'pgpool_switch_xlog' LANGUAGE C STRICT; diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql index 79946707c..a26ab2cd5 100644 --- a/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql +++ b/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql @@ -21,12 +21,12 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_remote_start' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) +CREATE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) RETURNS bool AS '$libdir/pgpool-recovery', 'pgpool_pgctl' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_switch_xlog(IN arcive_dir text) +CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text) RETURNS text AS 'MODULE_PATHNAME', 'pgpool_switch_xlog' LANGUAGE C STRICT; diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql index 6a0bd4a7b..f79bbddbd 100644 --- a/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql +++ b/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql @@ -30,12 +30,12 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_remote_start' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) +CREATE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) RETURNS bool AS '$libdir/pgpool-recovery', 'pgpool_pgctl' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_switch_xlog(IN arcive_dir text) +CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text) RETURNS text AS 'MODULE_PATHNAME', 'pgpool_switch_xlog' LANGUAGE C STRICT; diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql index aec2175ed..699ac215c 100644 --- a/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql +++ b/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql @@ -40,12 +40,12 @@ RETURNS bool AS 'MODULE_PATHNAME', 'pgpool_remote_start' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) +CREATE FUNCTION pgpool_pgctl(IN action text, IN stop_mode text) RETURNS bool AS '$libdir/pgpool-recovery', 'pgpool_pgctl' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgpool_switch_xlog(IN arcive_dir text) +CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text) RETURNS text AS 'MODULE_PATHNAME', 'pgpool_switch_xlog' LANGUAGE C STRICT; diff --git a/src/sql/pgpool-regclass/pgpool-regclass.sql.in b/src/sql/pgpool-regclass/pgpool-regclass.sql.in index df3080923..db647959c 100644 --- a/src/sql/pgpool-regclass/pgpool-regclass.sql.in +++ b/src/sql/pgpool-regclass/pgpool-regclass.sql.in @@ -1,4 +1,4 @@ -CREATE OR REPLACE FUNCTION pg_catalog.pgpool_regclass(cstring) +CREATE FUNCTION pg_catalog.pgpool_regclass(cstring) RETURNS oid AS 'MODULE_PATHNAME', 'pgpool_regclass' LANGUAGE C STRICT; -- 2.39.5