diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-18 15:29:51 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-18 15:29:51 +0000 |
| commit | 555b5a25dc52debe626bcaf0415029b46d204552 (patch) | |
| tree | 61172e0adf5bd78587136ef017971ca28ae97dc1 | |
| parent | 9c563b6fd0f08fa140459cc825e365514f2dcc2d (diff) | |
| download | postgresql-555b5a25dc52debe626bcaf0415029b46d204552.tar.gz postgresql-555b5a25dc52debe626bcaf0415029b46d204552.zip | |
Fix missing parentheses for current_query(), per bug #5378.
Also make a couple other minor editorial improvements.
| -rw-r--r-- | doc/src/sgml/func.sgml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 9a8df8cf4f7..59547a6a50f 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.482.2.2 2009/11/24 19:21:04 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.482.2.3 2010/03/18 15:29:51 tgl Exp $ --> <chapter id="functions"> <title>Functions and Operators</title> @@ -11397,7 +11397,7 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); <row> <entry><literal><function>current_schemas</function>(<type>boolean</type>)</literal></entry> <entry><type>name[]</type></entry> - <entry>names of schemas in search path optionally including implicit schemas</entry> + <entry>names of schemas in search path, optionally including implicit schemas</entry> </row> <row> @@ -11407,11 +11407,11 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); </row> <row> - <entry><literal><function>current_query</function></literal></entry> + <entry><literal><function>current_query</function>()</literal></entry> <entry><type>text</type></entry> <entry>text of the currently executing query, as submitted by the client (might contain more than one statement)</entry> - </row> + </row> <row> <!-- See also the entry for this in monitoring.sgml --> @@ -11491,6 +11491,17 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); </tgroup> </table> + <note> + <para> + <function>current_catalog</function>, <function>current_schema</function>, + <function>current_user</function>, <function>session_user</function>, + and <function>user</function> have special syntactic status + in <acronym>SQL</acronym>: they must be called without trailing + parentheses. (In PostgreSQL, parentheses can optionally be used with + <function>current_schema</function>, but not with the others.) + </para> + </note> + <indexterm> <primary>user</primary> <secondary>current</secondary> @@ -11536,17 +11547,6 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); the current user is the <quote>effective user</quote>. </para> - <note> - <para> - <function>current_catalog</function>, <function>current_schema</function>, - <function>current_user</function>, <function>session_user</function>, - and <function>user</function> have special syntactic status - in <acronym>SQL</acronym>: they must be called without trailing - parentheses (optional in PostgreSQL in the case - of <function>current_schema</function>). - </para> - </note> - <para> <function>current_schema</function> returns the name of the schema that is first in the search path (or a null value if the search path is |