Commit12dcf7b

committed

Have current_query() use ActivePortal->sourceText rather than

debug_query_string; this allows current_query() to be more accurate;docs updated; per idea from Tom

1 parentdeac948 commit12dcf7bCopy full SHA for 12dcf7b

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 2 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.465 2008/12/31 00:08:33 tgl Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.466 2009/01/07 21:48:15 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<chapter id="functions">`
`4`	`4`	`<title>Functions and Operators</title>`
`@@ -11343,7 +11343,8 @@ 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 contain more than one statement)</entry>`
	`11346`	`+ <entry>text of the currently executing query (might match`
	`11347`	`+ client-supplied query or be internal query string)</entry>`
`11347`	`11348`	`</row>`
`11348`	`11349`
`11349`	`11350`	`<row>`

Lines changed: 3 additions & 6 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.68 2009/01/0719:51:21 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.69 2009/01/0721: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`	`#defineatooid(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`	`/*`

Comments

(0)