From: Gilles Darold <gilles.darold@dalibo.com>
Date: Thu, 13 Apr 2017 15:45:01 +0000 (+0200)
Subject: Fix use of uninitialized value warning. Thanks to Payal for the report.
X-Git-Tag: v9.2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f74382941ad71d4702982a62106ab18ee37e9780;p=pgbadger

Fix use of uninitialized value warning. Thanks to Payal for the report.
---

diff --git a/pgbadger b/pgbadger
index a6c51a4..fc96b2e 100644
--- a/pgbadger
+++ b/pgbadger
@@ -14263,6 +14263,7 @@ sub build_log_line_prefix_regex
 		$self->{_output}	  = '';
 		$self->{_level_stack} = [];
 		$self->{_new_line}	= 1;
+		$self->{ '_is_in_create' } = 0;
 
 		my $last;
 		$self->{_tokens} = [tokenize_sql($self->query, 1)];
@@ -14524,12 +14525,18 @@ sub build_log_line_prefix_regex
 		if (!$self->_is_punctuation($token) and !$last_is_dot) {
 
 			my $sp = $self->_indent;
-			if ( (!defined($last_token) || $last_token ne '(') && ($token ne ')') && ($token !~ /^::/) ) {
-					$self->{_output} .= $sp if (!defined($last_token) || $last_token ne '::');
-			} elsif ( ($self->{ '_is_in_create' } == 2) && ($last_token eq '(')) {
-					$self->{_output} .= $sp if (!defined($last_token) || $last_token ne '::');
+			if ( (!defined($last_token) || $last_token ne '(') && $token ne ')' && ($token !~ /^::/) ) {
+			    $self->{ '_output' } .= $sp if ($token ne ')'
+							    && defined($last_token)
+							    && $last_token ne '::'
+							    && ($token ne '(' || !$self->_is_function( $last_token ))
+				);
+			    $self->{ '_output' } .= $sp if (!defined($last_token) && $token);
+			} elsif ( $self->{ '_is_in_create' } == 2 && defined($last_token)) {
+			    $self->{ '_output' } .= $sp if ($last_token ne '::' and ($last_token ne '(' || !$self->{ '_is_in_index' }));
 			}
 			$token =~ s/\n/\n$sp/gs;
+
 		}
 
 		# uppercase keywords