From: Gilles Darold <gilles.darold@dalibo.com>
Date: Fri, 5 Aug 2016 11:27:48 +0000 (+0200)
Subject: Fix garbage in event examples queries in error only mode (-w). Thanks to Thomas Reiss... 
X-Git-Tag: v8.2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40474fe1264a8dc9c7121d8cb93dbf0cb940621c;p=pgbadger

Fix garbage in event examples queries in error only mode (-w). Thanks to Thomas Reiss for the report.
---

diff --git a/pgbadger b/pgbadger
index 604e264..6bbae93 100755
--- a/pgbadger
+++ b/pgbadger
@@ -2831,13 +2831,13 @@ sub process_file
 					} elsif (exists $cur_cancel_info{$cur_pid}{query}) {
 						$cur_cancel_info{$cur_pid}{query} .= "\n" . $t_query;
 					} elsif (exists $cur_info{$cur_pid}{statement}) {
-						$cur_info{$cur_pid}{statement} .= "\n" . $t_query if (!$nomultiline);
+						$cur_info{$cur_pid}{statement} .= "\n" . $t_query if (!$nomultiline && !$error_only);
 					} elsif (exists $cur_info{$cur_pid}{context}) {
 						$cur_info{$cur_pid}{context} .= "\n" . $t_query;
 					} elsif (exists $cur_info{$cur_pid}{detail}) {
 						$cur_info{$cur_pid}{detail} .= "\n" . $t_query;
 					} elsif (exists $cur_info{$cur_pid}{query}) {
-						$cur_info{$cur_pid}{query} .= "\n" . $t_query if (!$nomultiline);
+						$cur_info{$cur_pid}{query} .= "\n" . $t_query if (!$nomultiline && !$error_only);
 					}
 
 				# Collect orphaned lines of multiline queries
@@ -2858,13 +2858,13 @@ sub process_file
 					} elsif (exists $cur_cancel_info{$cur_pid}{query}) {
 						$cur_cancel_info{$cur_pid}{query} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{statement}) {
-						$cur_info{$cur_pid}{statement} .= "\n" . $line if (!$nomultiline);
+						$cur_info{$cur_pid}{statement} .= "\n" . $line if (!$nomultiline && !$error_only);
 					} elsif (exists $cur_info{$cur_pid}{context}) {
 						$cur_info{$cur_pid}{context} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{detail}) {
 						$cur_info{$cur_pid}{detail} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{query}) {
-						$cur_info{$cur_pid}{query} .= "\n" . $line if (!$nomultiline);
+						$cur_info{$cur_pid}{query} .= "\n" . $line if (!$nomultiline && !$error_only);
 					}
 
 				} else {
@@ -3011,13 +3011,13 @@ sub process_file
 					} elsif (exists $cur_cancel_info{$cur_pid}{query}) {
 						$cur_cancel_info{$cur_pid}{query} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{statement}) {
-						$cur_info{$cur_pid}{statement} .= "\n" . $line if (!$nomultiline);
+						$cur_info{$cur_pid}{statement} .= "\n" . $line if (!$nomultiline && !$error_only);
 					} elsif (exists $cur_info{$cur_pid}{context}) {
 						$cur_info{$cur_pid}{context} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{detail}) {
 						$cur_info{$cur_pid}{detail} .= "\n" . $line;
 					} elsif (exists $cur_info{$cur_pid}{query}) {
-						$cur_info{$cur_pid}{query} .= "\n" . $line if (!$nomultiline);
+						$cur_info{$cur_pid}{query} .= "\n" . $line if (!$nomultiline && !$error_only);
 					}
 
 				# Collect orphaned lines of multiline queries