diff options
| -rw-r--r-- | doc/src/sgml/func.sgml | 5 | ||||
| -rw-r--r-- | src/backend/utils/adt/misc.c | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index bf3293a0cf2..897762f6e69 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.465 2008/12/31 00:08:33 tgl Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.466 2009/01/07 21:48:15 momjian Exp $ --> <chapter id="functions"> <title>Functions and Operators</title> @@ -11343,7 +11343,8 @@ 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 contain more than one statement)</entry> + <entry>text of the currently executing query (might match + client-supplied query or be internal query string)</entry> </row> <row> diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 2042f96f82a..bc068932e9d 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.68 2009/01/07 19:51:21 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.69 2009/01/07 21:48:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ #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)) @@ -59,11 +60,7 @@ current_database(PG_FUNCTION_ARGS) Datum current_query(PG_FUNCTION_ARGS) { - /* 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(); + PG_RETURN_TEXT_P(cstring_to_text(ActivePortal->sourceText)); } /* |