Remove unnecessary use of PROCEDURAL

Remove some unnecessary, legacy-looking use of the PROCEDURAL keyword
before LANGUAGE.  We mostly don't use this anymore, so some of these
look a bit old.

There is still some use in pg_dump, which is harder to remove because
it's baked into the archive format, so I'm not touching that.

Discussion: https://www.postgresql.org/message-id/2330919b-62d9-29ac-8de3-58c024fdcb96@2ndquadrant.com

diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml
index db765b46449989195c889c5d05785125a84429e0..d215ce82d08565aa0d3caa8842c7a4a82e93c952 100644 (file)
--- a/doc/src/sgml/xplang.sgml
+++ b/doc/src/sgml/xplang.sgml
@@ -137,7 +137,7 @@ CREATE FUNCTION <replaceable>validator_function_name</replaceable>(oid)
      <para>
       Finally, the PL must be declared with the command
 <synopsis>
-CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <replaceable>language-name</replaceable>
+CREATE <optional>TRUSTED</optional> LANGUAGE <replaceable>language-name</replaceable>
     HANDLER <replaceable>handler_function_name</replaceable>
     <optional>INLINE <replaceable>inline_function_name</replaceable></optional>
     <optional>VALIDATOR <replaceable>validator_function_name</replaceable></optional> ;
@@ -200,7 +200,7 @@ CREATE FUNCTION plperl_validator(oid) RETURNS void AS
      <para>
       The command:
 <programlisting>
-CREATE TRUSTED PROCEDURAL LANGUAGE plperl
+CREATE TRUSTED LANGUAGE plperl
     HANDLER plperl_call_handler
     INLINE plperl_inline_handler
     VALIDATOR plperl_validator;

diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 59c4e8dfd0909074c3ea10adab3dca56d43a34ad..b7917618bfffee3b9002b2a9d3fd5c7767a584ae 100644 (file)
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * proclang.c
- *       PostgreSQL PROCEDURAL LANGUAGE support code.
+ *       PostgreSQL LANGUAGE support code.
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -55,9 +55,8 @@ static ObjectAddress create_proc_lang(const char *languageName, bool replace,
                                 Oid valOid, bool trusted);
 static PLTemplate *find_language_template(const char *languageName);
 
-/* ---------------------------------------------------------------------
- * CREATE PROCEDURAL LANGUAGE
- * ---------------------------------------------------------------------
+/*
+ * CREATE LANGUAGE
  */
 ObjectAddress
 CreateProceduralLanguage(CreatePLangStmt *stmt)

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 6d035a072e5a9bc9961073e59134bfa79db3ba39..a7e859dc90ef137865f2abbb0cc38b6487ad0252 100644 (file)
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -2433,8 +2433,7 @@ typedef struct AlterEventTrigStmt
 } AlterEventTrigStmt;
 
 /* ----------------------
- *             Create/Drop PROCEDURAL LANGUAGE Statements
- *             Create PROCEDURAL LANGUAGE Statements
+ *             Create LANGUAGE Statements
  * ----------------------
  */
 typedef struct CreatePLangStmt

diff --git a/src/pl/plperl/plperl--1.0.sql b/src/pl/plperl/plperl--1.0.sql
index 801900f023db5b7eb74430b2ed2ad3d8a0bb2389..f716ba1c56381e3f6e77558d8b5a645a75f08a45 100644 (file)
--- a/src/pl/plperl/plperl--1.0.sql
+++ b/src/pl/plperl/plperl--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plperl;
+CREATE LANGUAGE plperl;
 
-COMMENT ON PROCEDURAL LANGUAGE plperl IS 'PL/Perl procedural language';
+COMMENT ON LANGUAGE plperl IS 'PL/Perl procedural language';

diff --git a/src/pl/plperl/plperl--unpackaged--1.0.sql b/src/pl/plperl/plperl--unpackaged--1.0.sql
index b062bd5d9b3d983c948115f38e946035b567d02f..5e097c443dba6b10c85eb59b5d762f6c955b2ff6 100644 (file)
--- a/src/pl/plperl/plperl--unpackaged--1.0.sql
+++ b/src/pl/plperl/plperl--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plperl/plperl--unpackaged--1.0.sql */
 
-ALTER EXTENSION plperl ADD PROCEDURAL LANGUAGE plperl;
+ALTER EXTENSION plperl ADD LANGUAGE plperl;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plperl ADD FUNCTION plperl_call_handler();
 ALTER EXTENSION plperl ADD FUNCTION plperl_inline_handler(internal);

diff --git a/src/pl/plperl/plperlu--1.0.sql b/src/pl/plperl/plperlu--1.0.sql
index d1d213dd5f8bcb68e3d8c4dac73f75bbf496a22f..7efb4fbc5bfd7091c0e3084ba709e4adad95f1cb 100644 (file)
--- a/src/pl/plperl/plperlu--1.0.sql
+++ b/src/pl/plperl/plperlu--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plperlu;
+CREATE LANGUAGE plperlu;
 
-COMMENT ON PROCEDURAL LANGUAGE plperlu IS 'PL/PerlU untrusted procedural language';
+COMMENT ON LANGUAGE plperlu IS 'PL/PerlU untrusted procedural language';

diff --git a/src/pl/plperl/plperlu--unpackaged--1.0.sql b/src/pl/plperl/plperlu--unpackaged--1.0.sql
index bc62d36a3d864e6195dfca56b9f72af9d199b103..36de1ddf49ecb7231b68382b2bbdf64a15c5c40a 100644 (file)
--- a/src/pl/plperl/plperlu--unpackaged--1.0.sql
+++ b/src/pl/plperl/plperlu--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plperl/plperlu--unpackaged--1.0.sql */
 
-ALTER EXTENSION plperlu ADD PROCEDURAL LANGUAGE plperlu;
+ALTER EXTENSION plperlu ADD LANGUAGE plperlu;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plperlu ADD FUNCTION plperlu_call_handler();
 ALTER EXTENSION plperlu ADD FUNCTION plperlu_inline_handler(internal);

diff --git a/src/pl/plpgsql/src/plpgsql--1.0.sql b/src/pl/plpgsql/src/plpgsql--1.0.sql
index 5eeea56824ea97673044072a91e2cfca8ef8351e..ab6fa84ab0d350c31b0e8adf067c517119011705 100644 (file)
--- a/src/pl/plpgsql/src/plpgsql--1.0.sql
+++ b/src/pl/plpgsql/src/plpgsql--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plpgsql;
+CREATE LANGUAGE plpgsql;
 
-COMMENT ON PROCEDURAL LANGUAGE plpgsql IS 'PL/pgSQL procedural language';
+COMMENT ON LANGUAGE plpgsql IS 'PL/pgSQL procedural language';

diff --git a/src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql b/src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql
index 9de7e8392aae2ea37b0aa8491ec13c63b4d7741a..15a74f091d69e5a2546fa67479985eacd5181421 100644 (file)
--- a/src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql
+++ b/src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql */
 
-ALTER EXTENSION plpgsql ADD PROCEDURAL LANGUAGE plpgsql;
+ALTER EXTENSION plpgsql ADD LANGUAGE plpgsql;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plpgsql ADD FUNCTION plpgsql_call_handler();
 ALTER EXTENSION plpgsql ADD FUNCTION plpgsql_inline_handler(internal);

diff --git a/src/pl/plpython/plpython2u--1.0.sql b/src/pl/plpython/plpython2u--1.0.sql
index e3a12b952eef737e502cfb91dc31a2212a6aaed7..661cc66a8913ffa9a7320bd86fbf54ee8e413743 100644 (file)
--- a/src/pl/plpython/plpython2u--1.0.sql
+++ b/src/pl/plpython/plpython2u--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plpython2u;
+CREATE LANGUAGE plpython2u;
 
-COMMENT ON PROCEDURAL LANGUAGE plpython2u IS 'PL/Python2U untrusted procedural language';
+COMMENT ON LANGUAGE plpython2u IS 'PL/Python2U untrusted procedural language';

diff --git a/src/pl/plpython/plpython2u--unpackaged--1.0.sql b/src/pl/plpython/plpython2u--unpackaged--1.0.sql
index a89d8b4d09e77ec37d41471687644b4ac3019d32..6efa2dbad93b8063ee6429ecd259284994161c1b 100644 (file)
--- a/src/pl/plpython/plpython2u--unpackaged--1.0.sql
+++ b/src/pl/plpython/plpython2u--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plpython/plpython2u--unpackaged--1.0.sql */
 
-ALTER EXTENSION plpython2u ADD PROCEDURAL LANGUAGE plpython2u;
+ALTER EXTENSION plpython2u ADD LANGUAGE plpython2u;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plpython2u ADD FUNCTION plpython2_call_handler();
 ALTER EXTENSION plpython2u ADD FUNCTION plpython2_inline_handler(internal);

diff --git a/src/pl/plpython/plpython3u--1.0.sql b/src/pl/plpython/plpython3u--1.0.sql
index cd1fb636a00adbd2ca33fb4224ec579676c8fb16..c0d6ea82c2de3cb428ea74ab30b4eefd1885fe37 100644 (file)
--- a/src/pl/plpython/plpython3u--1.0.sql
+++ b/src/pl/plpython/plpython3u--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plpython3u;
+CREATE LANGUAGE plpython3u;
 
-COMMENT ON PROCEDURAL LANGUAGE plpython3u IS 'PL/Python3U untrusted procedural language';
+COMMENT ON LANGUAGE plpython3u IS 'PL/Python3U untrusted procedural language';

diff --git a/src/pl/plpython/plpython3u--unpackaged--1.0.sql b/src/pl/plpython/plpython3u--unpackaged--1.0.sql
index b1c0d03a3043ab7f13a981b60496685996d9ddb5..fb8d3d6a65256923a074062fb7e085cf7a9fb46a 100644 (file)
--- a/src/pl/plpython/plpython3u--unpackaged--1.0.sql
+++ b/src/pl/plpython/plpython3u--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plpython/plpython3u--unpackaged--1.0.sql */
 
-ALTER EXTENSION plpython3u ADD PROCEDURAL LANGUAGE plpython3u;
+ALTER EXTENSION plpython3u ADD LANGUAGE plpython3u;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plpython3u ADD FUNCTION plpython3_call_handler();
 ALTER EXTENSION plpython3u ADD FUNCTION plpython3_inline_handler(internal);

diff --git a/src/pl/plpython/plpythonu--1.0.sql b/src/pl/plpython/plpythonu--1.0.sql
index 61d3d554c930dbcc80f278b02a586c28f78be8d4..4a3e64aac5088122e940cca66b605b7e0af6015e 100644 (file)
--- a/src/pl/plpython/plpythonu--1.0.sql
+++ b/src/pl/plpython/plpythonu--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE plpythonu;
+CREATE LANGUAGE plpythonu;
 
-COMMENT ON PROCEDURAL LANGUAGE plpythonu IS 'PL/PythonU untrusted procedural language';
+COMMENT ON LANGUAGE plpythonu IS 'PL/PythonU untrusted procedural language';

diff --git a/src/pl/plpython/plpythonu--unpackaged--1.0.sql b/src/pl/plpython/plpythonu--unpackaged--1.0.sql
index 7926233250830a3f13deeac003c4bff9a8dfcfd0..16b828f2fed3feeb151ceef1f12d0044dc5215d4 100644 (file)
--- a/src/pl/plpython/plpythonu--unpackaged--1.0.sql
+++ b/src/pl/plpython/plpythonu--unpackaged--1.0.sql
@@ -1,6 +1,6 @@
 /* src/pl/plpython/plpythonu--unpackaged--1.0.sql */
 
-ALTER EXTENSION plpythonu ADD PROCEDURAL LANGUAGE plpythonu;
+ALTER EXTENSION plpythonu ADD LANGUAGE plpythonu;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION plpythonu ADD FUNCTION plpython_call_handler();
 ALTER EXTENSION plpythonu ADD FUNCTION plpython_inline_handler(internal);

diff --git a/src/pl/tcl/pltcl--1.0.sql b/src/pl/tcl/pltcl--1.0.sql
index ecb264c818f19aebd2cf7d9538b8ff106e4389ce..34a68c8471f3e949bd783ded0f4a02ef3025d444 100644 (file)
--- a/src/pl/tcl/pltcl--1.0.sql
+++ b/src/pl/tcl/pltcl--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE pltcl;
+CREATE LANGUAGE pltcl;
 
-COMMENT ON PROCEDURAL LANGUAGE pltcl IS 'PL/Tcl procedural language';
+COMMENT ON LANGUAGE pltcl IS 'PL/Tcl procedural language';

diff --git a/src/pl/tcl/pltcl--unpackaged--1.0.sql b/src/pl/tcl/pltcl--unpackaged--1.0.sql
index dfad66c268ba93923db5f38831fcbee60a860db5..294125892afa51e2d0c6b9eb68664c8c0578afac 100644 (file)
--- a/src/pl/tcl/pltcl--unpackaged--1.0.sql
+++ b/src/pl/tcl/pltcl--unpackaged--1.0.sql
@@ -1,5 +1,5 @@
 /* src/pl/tcl/pltcl--unpackaged--1.0.sql */
 
-ALTER EXTENSION pltcl ADD PROCEDURAL LANGUAGE pltcl;
+ALTER EXTENSION pltcl ADD LANGUAGE pltcl;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION pltcl ADD FUNCTION pltcl_call_handler();

diff --git a/src/pl/tcl/pltclu--1.0.sql b/src/pl/tcl/pltclu--1.0.sql
index 72dcef11e5b2b826f746971652a6a85b36e8d9a8..e05b470aaf25dd58e19223a963ac94b8bac2dc92 100644 (file)
--- a/src/pl/tcl/pltclu--1.0.sql
+++ b/src/pl/tcl/pltclu--1.0.sql
@@ -6,6 +6,6 @@
  * knowledge into this script.
  */
 
-CREATE PROCEDURAL LANGUAGE pltclu;
+CREATE LANGUAGE pltclu;
 
-COMMENT ON PROCEDURAL LANGUAGE pltclu IS 'PL/TclU untrusted procedural language';
+COMMENT ON LANGUAGE pltclu IS 'PL/TclU untrusted procedural language';

diff --git a/src/pl/tcl/pltclu--unpackaged--1.0.sql b/src/pl/tcl/pltclu--unpackaged--1.0.sql
index a5d359fc047327ae800dff0d793fa485bc4d2442..dac18f8d87bd293749e2cf1f8d2ce573361c361f 100644 (file)
--- a/src/pl/tcl/pltclu--unpackaged--1.0.sql
+++ b/src/pl/tcl/pltclu--unpackaged--1.0.sql
@@ -1,5 +1,5 @@
 /* src/pl/tcl/pltclu--unpackaged--1.0.sql */
 
-ALTER EXTENSION pltclu ADD PROCEDURAL LANGUAGE pltclu;
+ALTER EXTENSION pltclu ADD LANGUAGE pltclu;
 -- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
 ALTER EXTENSION pltclu ADD FUNCTION pltclu_call_handler();