diff options
| -rw-r--r-- | doc/src/sgml/func.sgml | 5 | ||||
| -rw-r--r-- | src/backend/utils/adt/misc.c | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 897762f6e69..72d34efb8bf 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.466 2009/01/07 21:48:15 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.467 2009/01/08 00:13:21 momjian Exp $ --> <chapter id="functions"> <title>Functions and Operators</title> @@ -11343,8 +11343,7 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); <row> <entry><literal><function>current_query</function></literal></entry> <entry><type>text</type></entry> - <entry>text of the currently executing query (might match - client-supplied query or be internal query string)</entry> + <entry>text of the currently executing query (might contain more than one statement)</entry> </row> <row> diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index bc068932e9d..904abb911b1 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.69 2009/01/07 21:48:15 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.70 2009/01/08 00:13:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,6 @@ #include "storage/pmsignal.h" #include "storage/procarray.h" #include "utils/builtins.h" -#include "tcop/pquery.h" #include "tcop/tcopprot.h" #define atooid(x) ((Oid) strtoul((x), NULL, 10)) @@ -56,11 +55,16 @@ current_database(PG_FUNCTION_ARGS) /* * current_query() * Expose the current query to the user (useful in stored procedures) + * We might want to use ActivePortal->sourceText someday. */ Datum current_query(PG_FUNCTION_ARGS) { - PG_RETURN_TEXT_P(cstring_to_text(ActivePortal->sourceText)); + /* there is no easy way to access the more concise 'query_string' */ + if (debug_query_string) + PG_RETURN_TEXT_P(cstring_to_text(debug_query_string)); + else + PG_RETURN_NULL(); } /* |