From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 18 Apr 2006 00:52:41 +0000 (+0000)
Subject: Document that errors are not output by log_statement (was they were in
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=2e0803ab94ab868ca7b4a3acac1bf42792fbcf3d;p=users%2Fbernd%2Fpostgres.git

Document that errors are not output by log_statement (was they were in
8.0), and add as suggestion to use log_min_error_statement for this
purpose.  I also fixed the code so the first EXECUTE has it's prepare,
rather than the last which is what was in the current code.  Also remove
"protocol" prefix for SQL EXECUTE output because it is not accurate.

Backpatch to 8.1.X.
---

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index b617dfa814..55d8a6975b 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -2729,9 +2729,10 @@ SELECT * FROM parent WHERE key = 2400;
        <note>
         <para>
          The <command>EXECUTE</command> statement is not considered a
-         <literal>ddl</> or <literal>mod</> statement.  When it is logged, 
-         only the name of the prepared statement is reported, not the
-         actual prepared statement.
+         <literal>ddl</> or <literal>mod</> statement.  Statements that
+         generate errors are not logged.  Set
+         <varname>log_min_error_statement</> to <literal>error</> to
+         log such statements.      
         </para>
 
         <para>
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 33c5b1d81c..6248a8651c 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -578,19 +578,21 @@ log_after_parse(List *raw_parsetree_list, const char *query_string,
 
 		/*
 		 * For the first EXECUTE we find, record the client statement used by
-		 * the PREPARE.
+		 * the PREPARE.  PREPARE doesn't save the parse tree so we have no
+		 * way to conditionally output based on the type of query prepared.
 		 */
 		if (IsA(parsetree, ExecuteStmt))
 		{
 			ExecuteStmt *stmt = (ExecuteStmt *) parsetree;
 			PreparedStatement *entry;
 
-			if ((entry = FetchPreparedStatement(stmt->name, false)) != NULL &&
+			if (*prepare_string == NULL &&
+				(entry = FetchPreparedStatement(stmt->name, false)) != NULL &&
 				entry->query_string)
 			{
 				*prepare_string = palloc(strlen(entry->query_string) +
-									  strlen("  [client PREPARE:  %s]") - 1);
-				sprintf(*prepare_string, "  [client PREPARE:  %s]",
+									  strlen("  [PREPARE:  %s]") - 2 + 1);
+				sprintf(*prepare_string, "  [PREPARE:  %s]",
 						entry->query_string);
 			}
 		}