Commit1c175cd

committed

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

1 parentae3c075 commit1c175cdCopy full SHA for 1c175cd

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.466 2009/01/07 21:48:15 momjian Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.467 2009/01/08 00:13:21 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<chapter id="functions">`
`4`	`4`	`<title>Functions and Operators</title>`
`@@ -11343,8 +11343,7 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]);`
`11343`	`11343`	`<row>`
`11344`	`11344`	`<entry><literal><function>current_query</function></literal></entry>`
`11345`	`11345`	`<entry><type>text</type></entry>`
`11346`		`- <entry>text of the currently executing query (might match`
`11347`		`- client-supplied query or be internal query string)</entry>`
	`11346`	`+ <entry>text of the currently executing query (might contain more than one statement)</entry>`
`11348`	`11347`	`</row>`
`11349`	`11348`
`11350`	`11349`	`<row>`

Lines changed: 7 additions & 3 deletions

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.69 2009/01/07 21:48:15 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.70 2009/01/08 00:13:22 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -31,7 +31,6 @@`
`31`	`31`	`#include"storage/pmsignal.h"`
`32`	`32`	`#include"storage/procarray.h"`
`33`	`33`	`#include"utils/builtins.h"`
`34`		`-#include"tcop/pquery.h"`
`35`	`34`	`#include"tcop/tcopprot.h"`
`36`	`35`
`37`	`36`	`#defineatooid(x) ((Oid) strtoul((x), NULL, 10))`
`@@ -56,11 +55,16 @@ current_database(PG_FUNCTION_ARGS)`
`56`	`55`	`/*`
`57`	`56`	`* current_query()`
`58`	`57`	`* Expose the current query to the user (useful in stored procedures)`
	`58`	`+ * We might want to use ActivePortal->sourceText someday.`
`59`	`59`	`*/`
`60`	`60`	`Datum`
`61`	`61`	`current_query(PG_FUNCTION_ARGS)`
`62`	`62`	`{`
`63`		`-PG_RETURN_TEXT_P(cstring_to_text(ActivePortal->sourceText));`
	`63`	`+/* there is no easy way to access the more concise 'query_string' */`
	`64`	`+if (debug_query_string)`
	`65`	`+PG_RETURN_TEXT_P(cstring_to_text(debug_query_string));`
	`66`	`+else`
	`67`	`+PG_RETURN_NULL();`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`/*`

Comments

(0)