Extend regex on cursor name normalization.

diff --git a/pgbadger b/pgbadger
index 586310f5d979e0eaeb2b0d5abb65629ab80eff4f..c0e8eb405854817ca73fe20d9151fa92997309da 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -2916,10 +2916,10 @@ sub normalize_query
        $orig_query =~ s/([^a-z_\$-])0x[0-9a-f]{1,10}/${1}0x/g;
 
        # Remove IN values
-       $orig_query =~ s/in\s*\([\'0x,\s]*\)/in (...)/g;
+       $orig_query =~ s/\bin\s*\([\'0x,\s]*\)/in (...)/g;
 
        # Remove curor names in CURSOR and IN clauses
-       $orig_query =~ s/(declare|in)\s*"[a-zA-Z0-9_-]*"/\1 "..."/g;
+       $orig_query =~ s/\b(declare|in)\s+"[^"]+"/$1 "..."/g;
 
        return $orig_query;
 }