pg_dump test: Make concatenated create_sql commands more readable

petere · petere · commit 6e10631d1e6e · 2022-10-31T14:19:08.000+01:00
When the pg_dump 002_pg_dump.pl test generates the command to load the schema, it does # Add terminating semicolon $create_sql{$test_db} .= $tests{$test}->{create_sql} . ";"; In some cases, this creates a duplicate semicolon, but more importantly, this doesn't add any newline. So if you look at the result in either the server log or in tmp_check/log/regress_log_002_pg_dump, it looks like a complete mess. This patch makes the output look cleaner for manual inspection: add semicolon only if necessary, and add two newlines. Discussion: https://www.postgresql.org/message-id/flat/d6aec95a-8729-43cc-2578-f2a5e46640e0%40enterprisedb.com
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -3984,8 +3984,12 @@
 			next;
 		}
 
-		# Add terminating semicolon
-		$create_sql{$test_db} .= $tests{$test}->{create_sql} . ";";
+		# Normalize command ending: strip all line endings, add
+		# semicolon if missing, add two newlines.
+		my $create_sql = $tests{$test}->{create_sql};
+		chomp $create_sql;
+		$create_sql .= ';' unless substr($create_sql, -1) eq ';';
+		$create_sql{$test_db} .= $create_sql . "\n\n";
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3984,8 +3984,12 @@`
`3984`	`3984`	`next;`
`3985`	`3985`	`}`
`3986`	`3986`
`3987`		`- # Add terminating semicolon`
`3988`		`- $create_sql{$test_db} .= $tests{$test}->{create_sql} . ";";`
	`3987`	`+ # Normalize command ending: strip all line endings, add`
	`3988`	`+ # semicolon if missing, add two newlines.`
	`3989`	`+ my $create_sql = $tests{$test}->{create_sql};`
	`3990`	`+ chomp $create_sql;`
	`3991`	`+ $create_sql .= ';' unless substr($create_sql, -1) eq ';';`
	`3992`	`+ $create_sql{$test_db} .= $create_sql . "\n\n";`
`3989`	`3993`	`}`
`3990`	`3994`	`}`
`3991`	`3995`