Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbc09d5e

Browse files
committed
Remove unnecessary use of PROCEDURAL
Remove some unnecessary, legacy-looking use of the PROCEDURAL keywordbefore LANGUAGE. We mostly don't use this anymore, so some of theselook a bit old.There is still some use in pg_dump, which is harder to remove becauseit'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
1 parenteffe7d9 commitbc09d5e

19 files changed

+30
-32
lines changed

‎doc/src/sgml/xplang.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ CREATE FUNCTION <replaceable>validator_function_name</replaceable>(oid)
137137
<para>
138138
Finally, the PL must be declared with the command
139139
<synopsis>
140-
CREATE <optional>TRUSTED</optional><optional>PROCEDURAL</optional>LANGUAGE <replaceable>language-name</replaceable>
140+
CREATE <optional>TRUSTED</optional> LANGUAGE <replaceable>language-name</replaceable>
141141
HANDLER <replaceable>handler_function_name</replaceable>
142142
<optional>INLINE <replaceable>inline_function_name</replaceable></optional>
143143
<optional>VALIDATOR <replaceable>validator_function_name</replaceable></optional> ;
@@ -200,7 +200,7 @@ CREATE FUNCTION plperl_validator(oid) RETURNS void AS
200200
<para>
201201
The command:
202202
<programlisting>
203-
CREATE TRUSTEDPROCEDURALLANGUAGE plperl
203+
CREATE TRUSTED LANGUAGE plperl
204204
HANDLER plperl_call_handler
205205
INLINE plperl_inline_handler
206206
VALIDATOR plperl_validator;

‎src/backend/commands/proclang.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*-------------------------------------------------------------------------
22
*
33
* proclang.c
4-
* PostgreSQLPROCEDURALLANGUAGE support code.
4+
* PostgreSQL LANGUAGE support code.
55
*
66
* Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
@@ -55,9 +55,8 @@ static ObjectAddress create_proc_lang(const char *languageName, bool replace,
5555
OidvalOid,booltrusted);
5656
staticPLTemplate*find_language_template(constchar*languageName);
5757

58-
/* ---------------------------------------------------------------------
59-
* CREATE PROCEDURAL LANGUAGE
60-
* ---------------------------------------------------------------------
58+
/*
59+
* CREATE LANGUAGE
6160
*/
6261
ObjectAddress
6362
CreateProceduralLanguage(CreatePLangStmt*stmt)

‎src/include/nodes/parsenodes.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,8 +2433,7 @@ typedef struct AlterEventTrigStmt
24332433
}AlterEventTrigStmt;
24342434

24352435
/* ----------------------
2436-
*Create/Drop PROCEDURAL LANGUAGE Statements
2437-
*Create PROCEDURAL LANGUAGE Statements
2436+
*Create LANGUAGE Statements
24382437
* ----------------------
24392438
*/
24402439
typedefstructCreatePLangStmt

‎src/pl/plperl/plperl--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plperl;
9+
CREATELANGUAGEplperl;
1010

11-
COMMENTONPROCEDURALLANGUAGE plperl IS'PL/Perl procedural language';
11+
COMMENTON LANGUAGE plperl IS'PL/Perl procedural language';

‎src/pl/plperl/plperl--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plperl/plperl--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plperl ADDPROCEDURALLANGUAGE plperl;
3+
ALTER EXTENSION plperl ADD LANGUAGE plperl;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plperl ADD FUNCTION plperl_call_handler();
66
ALTER EXTENSION plperl ADD FUNCTION plperl_inline_handler(internal);

‎src/pl/plperl/plperlu--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plperlu;
9+
CREATELANGUAGEplperlu;
1010

11-
COMMENTONPROCEDURALLANGUAGE plperlu IS'PL/PerlU untrusted procedural language';
11+
COMMENTON LANGUAGE plperlu IS'PL/PerlU untrusted procedural language';

‎src/pl/plperl/plperlu--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plperl/plperlu--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plperlu ADDPROCEDURALLANGUAGE plperlu;
3+
ALTER EXTENSION plperlu ADD LANGUAGE plperlu;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plperlu ADD FUNCTION plperlu_call_handler();
66
ALTER EXTENSION plperlu ADD FUNCTION plperlu_inline_handler(internal);

‎src/pl/plpgsql/src/plpgsql--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plpgsql;
9+
CREATELANGUAGEplpgsql;
1010

11-
COMMENTONPROCEDURALLANGUAGE plpgsql IS'PL/pgSQL procedural language';
11+
COMMENTON LANGUAGE plpgsql IS'PL/pgSQL procedural language';

‎src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plpgsql/src/plpgsql--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plpgsql ADDPROCEDURALLANGUAGE plpgsql;
3+
ALTER EXTENSION plpgsql ADD LANGUAGE plpgsql;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plpgsql ADD FUNCTION plpgsql_call_handler();
66
ALTER EXTENSION plpgsql ADD FUNCTION plpgsql_inline_handler(internal);

‎src/pl/plpython/plpython2u--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plpython2u;
9+
CREATELANGUAGEplpython2u;
1010

11-
COMMENTONPROCEDURALLANGUAGE plpython2u IS'PL/Python2U untrusted procedural language';
11+
COMMENTON LANGUAGE plpython2u IS'PL/Python2U untrusted procedural language';

‎src/pl/plpython/plpython2u--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plpython/plpython2u--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plpython2u ADDPROCEDURALLANGUAGE plpython2u;
3+
ALTER EXTENSION plpython2u ADD LANGUAGE plpython2u;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plpython2u ADD FUNCTION plpython2_call_handler();
66
ALTER EXTENSION plpython2u ADD FUNCTION plpython2_inline_handler(internal);

‎src/pl/plpython/plpython3u--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plpython3u;
9+
CREATELANGUAGEplpython3u;
1010

11-
COMMENTONPROCEDURALLANGUAGE plpython3u IS'PL/Python3U untrusted procedural language';
11+
COMMENTON LANGUAGE plpython3u IS'PL/Python3U untrusted procedural language';

‎src/pl/plpython/plpython3u--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plpython/plpython3u--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plpython3u ADDPROCEDURALLANGUAGE plpython3u;
3+
ALTER EXTENSION plpython3u ADD LANGUAGE plpython3u;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plpython3u ADD FUNCTION plpython3_call_handler();
66
ALTER EXTENSION plpython3u ADD FUNCTION plpython3_inline_handler(internal);

‎src/pl/plpython/plpythonu--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE plpythonu;
9+
CREATELANGUAGEplpythonu;
1010

11-
COMMENTONPROCEDURALLANGUAGE plpythonu IS'PL/PythonU untrusted procedural language';
11+
COMMENTON LANGUAGE plpythonu IS'PL/PythonU untrusted procedural language';

‎src/pl/plpython/plpythonu--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* src/pl/plpython/plpythonu--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION plpythonu ADDPROCEDURALLANGUAGE plpythonu;
3+
ALTER EXTENSION plpythonu ADD LANGUAGE plpythonu;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION plpythonu ADD FUNCTION plpython_call_handler();
66
ALTER EXTENSION plpythonu ADD FUNCTION plpython_inline_handler(internal);

‎src/pl/tcl/pltcl--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE pltcl;
9+
CREATELANGUAGEpltcl;
1010

11-
COMMENTONPROCEDURALLANGUAGE pltcl IS'PL/Tcl procedural language';
11+
COMMENTON LANGUAGE pltcl IS'PL/Tcl procedural language';

‎src/pl/tcl/pltcl--unpackaged--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* src/pl/tcl/pltcl--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION pltcl ADDPROCEDURALLANGUAGE pltcl;
3+
ALTER EXTENSION pltcl ADD LANGUAGE pltcl;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION pltcl ADD FUNCTION pltcl_call_handler();

‎src/pl/tcl/pltclu--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* knowledge into this script.
77
*/
88

9-
CREATEPROCEDURALLANGUAGE pltclu;
9+
CREATELANGUAGEpltclu;
1010

11-
COMMENTONPROCEDURALLANGUAGE pltclu IS'PL/TclU untrusted procedural language';
11+
COMMENTON LANGUAGE pltclu IS'PL/TclU untrusted procedural language';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* src/pl/tcl/pltclu--unpackaged--1.0.sql*/
22

3-
ALTER EXTENSION pltclu ADDPROCEDURALLANGUAGE pltclu;
3+
ALTER EXTENSION pltclu ADD LANGUAGE pltclu;
44
-- ALTER ADD LANGUAGE doesn't pick up the support functions, so we have to.
55
ALTER EXTENSION pltclu ADD FUNCTION pltclu_call_handler();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp