Have current_query() use ActivePortal->sourceText rather than

bmomjian · bmomjian · commit 12dcf7bb7552 · 2009-01-07T21:48:15.000Z
debug_query_string;  this allows current_query() to be more accurate;
docs updated;  per idea from Tom
diff --git 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
@@ -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));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.68 2009/01/07 19:51:21 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.69 2009/01/07 21:48:15 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "storage/pmsignal.h"`
`32`	`32`	`#include "storage/procarray.h"`
`33`	`33`	`#include "utils/builtins.h"`
	`34`	`+#include "tcop/pquery.h"`
`34`	`35`	`#include "tcop/tcopprot.h"`
`35`	`36`
`36`	`37`	`#define atooid(x) ((Oid) strtoul((x), NULL, 10))`
`@@ -59,11 +60,7 @@ current_database(PG_FUNCTION_ARGS)`
`59`	`60`	`Datum`
`60`	`61`	`current_query(PG_FUNCTION_ARGS)`
`61`	`62`	`{`
`62`		`- /* there is no easy way to access the more concise 'query_string' */`
`63`		`- if (debug_query_string)`
`64`		`- PG_RETURN_TEXT_P(cstring_to_text(debug_query_string));`
`65`		`- else`
`66`		`- PG_RETURN_NULL();`
	`63`	`+ PG_RETURN_TEXT_P(cstring_to_text(ActivePortal->sourceText));`
`67`	`64`	`}`
`68`	`65`
`69`	`66`	`/*`