database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Revert current_query() change to use debug_query_string again; add comment.

Browse Source
This commit is contained in:
Bruce Momjian
2009-01-08 00:13:22 +00:00
parent ae3c075221
commit 1c175cd76a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/sgml/func.sgml
View File

@ -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"> <chapter id="functions">
<title>Functions and Operators</title> <title>Functions and Operators</title>
@ -11343,8 +11343,7 @@ 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><type>text</type></entry>
<entry>text of the currently executing query (might match <entry>text of the currently executing query (might contain more than one statement)</entry>
client-supplied query or be internal query string)</entry>
</row> </row>
<row> <row>

10
src/backend/utils/adt/misc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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/pmsignal.h"
#include "storage/procarray.h" #include "storage/procarray.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "tcop/pquery.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10)) #define atooid(x) ((Oid) strtoul((x), NULL, 10))
@ -56,11 +55,16 @@ current_database(PG_FUNCTION_ARGS)
/* /*
* current_query() * current_query()
* Expose the current query to the user (useful in stored procedures) * Expose the current query to the user (useful in stored procedures)
* We might want to use ActivePortal->sourceText someday.
*/ */
Datum Datum
current_query(PG_FUNCTION_ARGS) 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();
} }
/* /*