Fix wierd nested indenting when using multi conditional join with integer 0 value. Thanks to Neszt Tibor for the report.

Author: darold

lib/pgFormatter/Beautify.pm

@@ -3299,7 +3299,7 @@ sub beautify {
 			and ( not defined $last or uc($last) ne 'MATCH' ) )
 		{
 			$self->{'no_break'} = 0;
-			if ( !$self->{'_is_in_join'} and ( $last and $last ne ')' ) ) {
+			if ( !$self->{'_is_in_join'} and ( defined $last and $last ne ')' ) ) {
 				$self->_back( $token, $last ) if ($#{ $self->{'_level_stack'} } < 0 or $self->{'_level'} > $self->{'_level_stack'}[-1]+1);
 			}
 			if ( $self->{'_has_over_in_join'} ) {
@@ -3332,7 +3332,7 @@ sub beautify {
 				$self->_new_line( $token, $last );
 				$self->_back( $token, $last )
 				  if ( $self->{'_has_over_in_join'} );
-				$self->{'_has_over_in_join'} = 0;
+				  $self->{'_has_over_in_join'} = 0;
 			}
 			$self->_add_token($token);
 			$self->{'_is_in_join'} = 1;
@@ -3364,7 +3364,7 @@ sub beautify {
 			$self->{'_is_in_join'} = 0;
 			if (    !$self->{'_is_in_if'}
 				and !$self->{'_is_in_index'}
-				and ( !$last or $last !~ /^(?:CREATE)$/i )
+				and ( not defined $last or $last !~ /^(?:CREATE)$/i )
 				and ( $self->{'_is_in_create'} <= 2 )
 				and !$self->{'_is_in_trigger'} )
 			{

t/pg-test-files/expected/partition_join.sql

@@ -1863,7 +1863,7 @@ FROM
             prt1_l t2
             JOIN prt2_l t3 ON (t2.a = t3.b
                     AND t2.c = t3.c)) ss ON t1.a = ss.t2a
-    AND t1.c = ss.t2c
+        AND t1.c = ss.t2c
 WHERE
     t1.b = 0
 ORDER BY
@@ -1884,7 +1884,7 @@ FROM
             prt1_l t2
             JOIN prt2_l t3 ON (t2.a = t3.b
                     AND t2.c = t3.c)) ss ON t1.a = ss.t2a
-    AND t1.c = ss.t2c
+        AND t1.c = ss.t2c
 WHERE
     t1.b = 0
 ORDER BY

t/test-files/ex78.sql

@@ -33,3 +33,12 @@ WHERE
 ORDER BY
   z.worker_id;
 
+CREATE OR REPLACE VIEW test AS
+SELECT
+        *
+FROM
+        test1 AS a
+        INNER JOIN test2 AS b ON a.field1 = b.field1 AND b.field2 = 'data2' AND b.field3 = 'data3'
+        INNER JOIN test2 AS b ON a.field1 = b.field1 AND b.field2 = 'data2' AND b.field3 = 0
+        INNER JOIN test2 AS b ON a.field1 = b.field1 AND b.field2 = 'data2' AND b.field3 = 'data3'
+        INNER JOIN test2 AS b ON a.field1 = b.field1 AND b.field2 = 'data2' AND b.field3 = 'data3';

t/test-files/expected/ex78.sql

@@ -34,3 +34,21 @@ WHERE
 ORDER BY
     z.worker_id;
 
+CREATE OR REPLACE VIEW test AS
+SELECT
+    *
+FROM
+    test1 AS a
+    INNER JOIN test2 AS b ON a.field1 = b.field1
+        AND b.field2 = 'data2'
+        AND b.field3 = 'data3'
+    INNER JOIN test2 AS b ON a.field1 = b.field1
+        AND b.field2 = 'data2'
+        AND b.field3 = 0
+    INNER JOIN test2 AS b ON a.field1 = b.field1
+        AND b.field2 = 'data2'
+        AND b.field3 = 'data3'
+    INNER JOIN test2 AS b ON a.field1 = b.field1
+        AND b.field2 = 'data2'
+        AND b.field3 = 'data3';
+