From 0c8ed2dafb13fbb41e49524190b94553ad4348a7 Mon Sep 17 00:00:00 2001 From: Robert Haas <rhaas@postgresql.org> Date: Wed, 22 Sep 2010 21:57:37 -0400 Subject: [PATCH] Fix inconsistent capitalization of "PL/pgSQL". Josh Kupershmidt --- doc/src/sgml/external-projects.sgml | 2 +- doc/src/sgml/plpgsql.sgml | 14 +++++++------- doc/src/sgml/release-7.4.sgml | 2 +- doc/src/sgml/release-8.0.sgml | 2 +- doc/src/sgml/release-8.1.sgml | 10 +++++----- doc/src/sgml/release-8.2.sgml | 6 +++--- doc/src/sgml/release-8.3.sgml | 14 +++++++------- doc/src/sgml/release-8.4.sgml | 4 ++-- doc/src/sgml/release-9.0.sgml | 2 +- doc/src/sgml/release-old.sgml | 2 +- src/pl/plpgsql/src/gram.y | 6 +++--- src/pl/plpgsql/src/pl_comp.c | 4 ++-- src/pl/plpgsql/src/pl_exec.c | 2 +- src/test/regress/expected/plpgsql.out | 2 +- src/test/regress/sql/plpgsql.sql | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml index 7c80dec6a60..8927ef344b1 100644 --- a/doc/src/sgml/external-projects.sgml +++ b/doc/src/sgml/external-projects.sgml @@ -145,7 +145,7 @@ <para> <productname>PostgreSQL</productname> includes several procedural languages with the base distribution: <link - linkend="plpgsql">PL/PgSQL</link>, <link linkend="pltcl">PL/Tcl</link>, + linkend="plpgsql">PL/pgSQL</link>, <link linkend="pltcl">PL/Tcl</link>, <link linkend="plperl">PL/Perl</link>, and <link linkend="plpython">PL/Python</link>. </para> diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index da831a09712..d3bf847c892 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -1139,17 +1139,17 @@ EXECUTE 'SELECT count(*) FROM ' <indexterm> <primary>quote_ident</primary> - <secondary>use in PL/PgSQL</secondary> + <secondary>use in PL/pgSQL</secondary> </indexterm> <indexterm> <primary>quote_literal</primary> - <secondary>use in PL/PgSQL</secondary> + <secondary>use in PL/pgSQL</secondary> </indexterm> <indexterm> <primary>quote_nullable</primary> - <secondary>use in PL/PgSQL</secondary> + <secondary>use in PL/pgSQL</secondary> </indexterm> <para> @@ -1492,11 +1492,11 @@ RETURN <replaceable>expression</replaceable>; <title><command>RETURN NEXT</> and <command>RETURN QUERY</command></title> <indexterm> <primary>RETURN NEXT</primary> - <secondary>in PL/PgSQL</secondary> + <secondary>in PL/pgSQL</secondary> </indexterm> <indexterm> <primary>RETURN QUERY</primary> - <secondary>in PL/PgSQL</secondary> + <secondary>in PL/pgSQL</secondary> </indexterm> <synopsis> @@ -2220,7 +2220,7 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>; <indexterm> <primary>exceptions</primary> - <secondary>in PL/PgSQL</secondary> + <secondary>in PL/pgSQL</secondary> </indexterm> <para> @@ -2898,7 +2898,7 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>; <indexterm> <primary>reporting errors</primary> - <secondary>in PL/PgSQL</secondary> + <secondary>in PL/pgSQL</secondary> </indexterm> <para> diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml index ce1fb039da8..1886f4d94a2 100644 --- a/doc/src/sgml/release-7.4.sgml +++ b/doc/src/sgml/release-7.4.sgml @@ -1897,7 +1897,7 @@ enabled</para></listitem> files during postmaster startup</para></listitem> <listitem><para>Various memory leakage fixes</para></listitem> <listitem><para>Various portability improvements</para></listitem> -<listitem><para>Fix PL/PgSQL to handle <literal>var := var</> correctly when +<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when the variable is of pass-by-reference type</para></listitem> <listitem><para>Update <filename>contrib/tsearch2</> to use current Snowball code</para></listitem> diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml index 0174b8e3e89..ae9e119af26 100644 --- a/doc/src/sgml/release-8.0.sgml +++ b/doc/src/sgml/release-8.0.sgml @@ -2512,7 +2512,7 @@ when opening the file fails</para></listitem> constraints more reliably</para></listitem> <listitem><para>Fix password prompting in <application>pg_restore</> on Windows</para></listitem> -<listitem><para>Fix PL/PgSQL to handle <literal>var := var</> correctly when +<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when the variable is of pass-by-reference type</para></listitem> <listitem><para>Fix PL/Perl <literal>%_SHARED</> so it's actually shared</para></listitem> diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml index c4ea4484994..2d84b0080c7 100644 --- a/doc/src/sgml/release-8.1.sgml +++ b/doc/src/sgml/release-8.1.sgml @@ -1212,7 +1212,7 @@ <listitem> <para> - Fix PL/PgSQL to not fail when a <literal>FOR</> loop's target variable + Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable is a record containing composite-type fields (Tom) </para> </listitem> @@ -4343,7 +4343,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London'; <listitem> <para> - Allow SQL and PL/PgSQL functions to use <command>OUT</> and + Allow SQL and PL/pgSQL functions to use <command>OUT</> and <command>INOUT</> parameters (Tom) </para> <para> @@ -4378,12 +4378,12 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London'; </sect3> <sect3> - <title>PL/PgSQL Server-Side Language Changes</title> + <title>PL/pgSQL Server-Side Language Changes</title> <itemizedlist> <listitem> <para> - Overhaul the memory management of PL/PgSQL functions (Neil) + Overhaul the memory management of PL/pgSQL functions (Neil) </para> <para> The parsetree of each function is now stored in a separate @@ -4426,7 +4426,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London'; <listitem> <para> Add support for an optional <command>INTO</> clause to - PL/PgSQL's <command>EXECUTE</> statement (Pavel Stehule, Neil) + PL/pgSQL's <command>EXECUTE</> statement (Pavel Stehule, Neil) </para> </listitem> diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml index 7a552bc1065..01254fe6736 100644 --- a/doc/src/sgml/release-8.2.sgml +++ b/doc/src/sgml/release-8.2.sgml @@ -1661,7 +1661,7 @@ <listitem> <para> - Fix PL/PgSQL to not fail when a <literal>FOR</> loop's target variable + Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable is a record containing composite-type fields (Tom) </para> </listitem> @@ -4883,7 +4883,7 @@ </sect3> <sect3> - <title>PL/PgSQL Server-Side Language Changes</title> + <title>PL/pgSQL Server-Side Language Changes</title> <itemizedlist> <listitem> @@ -5448,7 +5448,7 @@ linkend="guc-local-preload-libraries"><varname>local_preload_libraries</></link> that allows libraries to be loaded into specific sessions without explicit cooperation from the client application. This allows - external add-ons to implement features such as a PL/PgSQL debugger. + external add-ons to implement features such as a PL/pgSQL debugger. </para> </listitem> diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml index 9827b932cb8..bf18c6a67e6 100644 --- a/doc/src/sgml/release-8.3.sgml +++ b/doc/src/sgml/release-8.3.sgml @@ -2239,7 +2239,7 @@ <listitem> <para> - Fix PL/PgSQL to not fail when a <literal>FOR</> loop's target variable + Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable is a record containing composite-type fields (Tom) </para> </listitem> @@ -3914,7 +3914,7 @@ current_date < 2017-11-17 </para> <para> - Previously PL/PgSQL functions that referenced temporary tables + Previously PL/pgSQL functions that referenced temporary tables would fail if the temporary table was dropped and recreated between function invocations, unless <literal>EXECUTE</> was used. This improvement fixes that problem and many related issues. @@ -4740,7 +4740,7 @@ current_date < 2017-11-17 The first request for statistics in a transaction takes a statistics snapshot that does not change during the transaction. This function allows the snapshot to be discarded and a new snapshot loaded during - the next statistics query. This is particularly useful for PL/PgSQL + the next statistics query. This is particularly useful for PL/pgSQL functions, which are confined to a single transaction. </para> </listitem> @@ -4835,7 +4835,7 @@ current_date < 2017-11-17 </sect3> <sect3> - <title>PL/PgSQL Server-Side Language</title> + <title>PL/pgSQL Server-Side Language</title> <itemizedlist> <listitem> @@ -4848,7 +4848,7 @@ current_date < 2017-11-17 <listitem> <para> Allow <literal>IN</literal> as an alternative to - <literal>FROM</literal> in PL/PgSQL's <command>FETCH</command> + <literal>FROM</literal> in PL/pgSQL's <command>FETCH</command> statement, for consistency with the backend's <command>FETCH</command> command (Pavel Stehule) </para> @@ -4856,7 +4856,7 @@ current_date < 2017-11-17 <listitem> <para> - Add <command>MOVE</command> to PL/PgSQL (Magnus, Pavel Stehule, + Add <command>MOVE</command> to PL/pgSQL (Magnus, Pavel Stehule, Neil) </para> </listitem> @@ -4867,7 +4867,7 @@ current_date < 2017-11-17 </para> <para> - This adds convenient syntax for PL/PgSQL set-returning functions + This adds convenient syntax for PL/pgSQL set-returning functions that want to return the result of a query. <command>RETURN QUERY</> is easier and more efficient than a loop around <command>RETURN NEXT</command>. diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml index 9c88d24d294..884c4a5d591 100644 --- a/doc/src/sgml/release-8.4.sgml +++ b/doc/src/sgml/release-8.4.sgml @@ -2689,7 +2689,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE </para> <para> - In particular, this means that functions written in PL/PgSQL + In particular, this means that functions written in PL/pgSQL and other PL languages can now be called this way. </para> </listitem> @@ -3815,7 +3815,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE </sect4> <sect4> - <title>PL/PgSQL Server-Side Language</title> + <title>PL/pgSQL Server-Side Language</title> <itemizedlist> <listitem> diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml index d425c003269..d928f6c5ffa 100644 --- a/doc/src/sgml/release-9.0.sgml +++ b/doc/src/sgml/release-9.0.sgml @@ -1948,7 +1948,7 @@ </itemizedlist> <sect4> - <title><link linkend="plpgsql">PL/PgSQL</link> Server-Side + <title><link linkend="plpgsql">PL/pgSQL</link> Server-Side Language</title> <itemizedlist> diff --git a/doc/src/sgml/release-old.sgml b/doc/src/sgml/release-old.sgml index 25c3f2e6fa0..7cb1451cdcc 100644 --- a/doc/src/sgml/release-old.sgml +++ b/doc/src/sgml/release-old.sgml @@ -692,7 +692,7 @@ pages</para></listitem> enabled</para></listitem> <listitem><para>Various memory leakage fixes</para></listitem> <listitem><para>Various portability improvements</para></listitem> -<listitem><para>Fix PL/PgSQL to handle <literal>var := var</> correctly when +<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when the variable is of pass-by-reference type</para></listitem> </itemizedlist> diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index bd62942c279..a28c6707e46 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -3058,11 +3058,11 @@ make_scalar_list1(char *initial_name, } /* - * When the PL/PgSQL parser expects to see a SQL statement, it is very + * When the PL/pgSQL parser expects to see a SQL statement, it is very * liberal in what it accepts; for example, we often assume an * unrecognized keyword is the beginning of a SQL statement. This * avoids the need to duplicate parts of the SQL grammar in the - * PL/PgSQL grammar, but it means we can accept wildly malformed + * PL/pgSQL grammar, but it means we can accept wildly malformed * input. To try and catch some of the more obviously invalid input, * we run the strings we expect to be SQL statements through the main * SQL parser. @@ -3071,7 +3071,7 @@ make_scalar_list1(char *initial_name, * any database access and does not check any semantic rules, it just * checks for basic syntactic correctness. We do this here, rather * than after parsing has finished, because a malformed SQL statement - * may cause the PL/PgSQL parser to become confused about statement + * may cause the PL/pgSQL parser to become confused about statement * borders. So it is best to bail out as early as we can. * * It is assumed that "stmt" represents a copy of the function source text diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index e09b55b0b08..3ddcf3b5a59 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -336,7 +336,7 @@ do_compile(FunctionCallInfo fcinfo, * per-function memory context, so it can be reclaimed easily. */ func_cxt = AllocSetContextCreate(TopMemoryContext, - "PL/PgSQL function context", + "PL/pgSQL function context", ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); @@ -768,7 +768,7 @@ plpgsql_compile_inline(char *proc_source) * its own memory context, so it can be reclaimed easily. */ func_cxt = AllocSetContextCreate(CurrentMemoryContext, - "PL/PgSQL function context", + "PL/pgSQL function context", ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 8b4855b50e2..6601320de30 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -2064,7 +2064,7 @@ static int exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt) { /* - * If processing a set-returning PL/PgSQL function, the final RETURN + * If processing a set-returning PL/pgSQL function, the final RETURN * indicates that the function is finished producing tuples. The rest of * the work will be done at the top level. */ diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index de17574f417..b454e63e58a 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -1541,7 +1541,7 @@ insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '') ERROR: IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max) -- -- The following tests are unrelated to the scenario outlined above; --- they merely exercise specific parts of PL/PgSQL +-- they merely exercise specific parts of PL/pgSQL -- -- -- Test recursion, per bug report 7-Sep-01 diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index 6783678b34b..4811558c4a9 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -1420,7 +1420,7 @@ insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '') -- -- The following tests are unrelated to the scenario outlined above; --- they merely exercise specific parts of PL/PgSQL +-- they merely exercise specific parts of PL/pgSQL -- -- -- GitLab