From: Darold Gilles <gilles@darold.net>
Date: Sat, 6 Feb 2016 09:56:21 +0000 (+0100)
Subject: Fix incorrect numbers on positional parameters in queries-generating-most-temporary... 
X-Git-Tag: v8.0~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe709c5c56db5f8a81d656bb72e4748beb876b34;p=pgbadger

Fix incorrect numbers on positional parameters in queries-generating-most-temporary-files. Thanks to Oskar Wiksten for the report.
---

diff --git a/pgbadger b/pgbadger
index b2d924e..383af43 100755
--- a/pgbadger
+++ b/pgbadger
@@ -3117,24 +3117,24 @@ sub normalize_query
 	$orig_query =~ s/AS\s+"([^"]+)"/'AS "' . remove_alias($1) . '"'/eigs;
 	
 	# Remove string content
-	$orig_query =~ s/\\'//g;
-	$orig_query =~ s/'[^']*'/''/g;
-	$orig_query =~ s/''('')+/''/g;
+	$orig_query =~ s/\\'//gs;
+	$orig_query =~ s/'[^']*'/''/gs;
+	$orig_query =~ s/''('')+/''/gs;
 
 	# Remove NULL parameters
-	$orig_query =~ s/=\s*NULL/=''/g;
+	$orig_query =~ s/=\s*NULL/=''/gs;
 
 	# Remove numbers
-	$orig_query =~ s/([^a-z_\$-])-?([0-9]+)/${1}0/g;
+	$orig_query =~ s/([^a-z0-9_\$\-])-?\d+/${1}0/gs;
 
 	# Remove hexadecimal numbers
-	$orig_query =~ s/([^a-z_\$-])0x[0-9a-f]{1,10}/${1}0x/g;
+	$orig_query =~ s/([^a-z_\$-])0x[0-9a-f]{1,10}/${1}0x/gs;
 
 	# Remove IN values
-	$orig_query =~ s/\bin\s*\([\'0x,\s]*\)/in (...)/g;
+	$orig_query =~ s/\bin\s*\([\'0x,\s]*\)/in (...)/gs;
 
 	# Remove curor names in CURSOR and IN clauses
-	$orig_query =~ s/\b(declare|in)\s+"[^"]+"/$1 "..."/g;
+	$orig_query =~ s/\b(declare|in)\s+"[^"]+"/$1 "..."/gs;
 
 	return $orig_query;
 }