Filter out table items from same_schema if 'notable' is set

turnstep · turnstep · commit 9ffe0dbadaed · 2019-10-28T17:53:39.000Z
diff --git a/check_postgres.pl b/check_postgres.pl
@@ -7775,12 +7775,13 @@ sub schema_item_exists {
                         next if exists $it->{schemaname} and keys %{ $itemhash->{$db1}{schema} } and ! exists $itemhash->{$db2}{schema}{ $it->{schemaname} };
                     }
 
-                    ## Skip if this item has a table, but the table does not match
+                    ## Skip if this item has a table, but the table does not match (or if 'notables' is set)
                     if ($item_class ne 'table') {
                         my $it = $itemhash->{$db1}{$item_class}{$name};
                         next if exists $it->{tablename}
                           and exists $itemhash->{$db1}{table}{ $it->{tablename} }
-                          and exists $itemhash->{$db2}{table}{ $it->{tablename} };
+                          and ! exists $itemhash->{$db2}{table}{ $it->{tablename} };
+                        next if exists $it->{tablename} and $opt{filtered}{notable};
                     }
 
                     my $one = '1';

Original file line number	Diff line number	Diff line change
`@@ -7775,12 +7775,13 @@ sub schema_item_exists {`
`7775`	`7775`	`next if exists $it->{schemaname} and keys %{ $itemhash->{$db1}{schema} } and ! exists $itemhash->{$db2}{schema}{ $it->{schemaname} };`
`7776`	`7776`	`}`
`7777`	`7777`
`7778`		`- ## Skip if this item has a table, but the table does not match`
	`7778`	`+ ## Skip if this item has a table, but the table does not match (or if 'notables' is set)`
`7779`	`7779`	`if ($item_class ne 'table') {`
`7780`	`7780`	`my $it = $itemhash->{$db1}{$item_class}{$name};`
`7781`	`7781`	`next if exists $it->{tablename}`
`7782`	`7782`	`and exists $itemhash->{$db1}{table}{ $it->{tablename} }`
`7783`		`- and exists $itemhash->{$db2}{table}{ $it->{tablename} };`
	`7783`	`+ and ! exists $itemhash->{$db2}{table}{ $it->{tablename} };`
	`7784`	`+ next if exists $it->{tablename} and $opt{filtered}{notable};`
`7784`	`7785`	`}`
`7785`	`7786`
`7786`	`7787`	`my $one = '1';`