mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have current_query() use ActivePortal->sourceText rather than

Browse Source 
debug_query_string;  this allows current_query() to be more accurate;
docs updated;  per idea from Tom
This commit is contained in:
Bruce Momjian 2009-01-07 21:48:15 +00:00
parent deac9488d3
commit 12dcf7bb75
2 changed files with 6 additions and 8 deletions
Show Stats 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.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>

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

@ -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));
}
/*