summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Sabino Mullane2011-07-27 15:07:31 +0000
committerGreg Sabino Mullane2011-07-27 15:07:31 +0000
commit978a1814edd9f3add76f38806748e28956b56620 (patch)
treea6114c5c8b4a21e35dab0bccea51789395f9fc4e
parent133a79e703844ffb10f21372342222c1ae427ae6 (diff)
More prosrc filtering tweaks.
-rwxr-xr-xcheck_postgres.pl21
1 files changed, 15 insertions, 6 deletions
diff --git a/check_postgres.pl b/check_postgres.pl
index 553ceda68..d67f7b833 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -6273,10 +6273,22 @@ sub check_same_schema {
}
## Do not show function body differences if filtered out with "nofuncbody"
+ ## Also skip if the equivalent 'dash' and 'empty'
if ($item eq 'function'
- and $col eq 'prosrc'
- and $opt{filtered}{nofuncbody}) {
- next;
+ and $col eq 'prosrc') {
+
+ next if $opt{filtered}{nofuncbody};
+ my ($one,$two);
+ for my $db (sort keys %{ $tdiff->{coldiff}{$col} }) {
+ if (defined $one) {
+ $two = $tdiff->{coldiff}{$col}{$db};
+ }
+ else {
+ $one = $tdiff->{coldiff}{$col}{$db};
+ }
+ }
+ next if $one eq '-' and $two eq '';
+ next if $one eq '' and $two eq '-';
}
## If we are doing a historical comparison, skip some items
@@ -6789,9 +6801,6 @@ sub find_catalog_info {
$args =~ s/int8/bigint/g;
$name .= "($args)";
- ## Special transform for probin, which may be different depending on the version
- $row->{probin} = '-' if $row->{probin} eq '';
-
}
## For columns, reduce the attnum to a simpler canonical form without holes