@@ -2548,11 +2548,12 @@ public ResultSet getImportedKeys(String catalog, String schema, String table)
25482548 ignoreAccessErrors ,
25492549 (bqTable , results , fields ) -> {
25502550 TableConstraints constraints = bqTable .getTableConstraints ();
2551- if (constraints != null && constraints .getForeignKeys () != null ) {
2552- for (ForeignKey fk : constraints .getForeignKeys ()) {
2553- TableId pkTableId = fk .getReferencedTable ();
2554- processForeignKey (fk , pkTableId , bqTable .getTableId (), results , fields );
2555- }
2551+ if (constraints == null || constraints .getForeignKeys () == null ) {
2552+ return ;
2553+ }
2554+ for (ForeignKey fk : constraints .getForeignKeys ()) {
2555+ TableId pkTableId = fk .getReferencedTable ();
2556+ processForeignKey (fk , pkTableId , bqTable .getTableId (), results , fields );
25562557 }
25572558 });
25582559
@@ -2618,15 +2619,17 @@ public ResultSet getCrossReference(
26182619 ignoreAccessErrors ,
26192620 (bqTable , results , fields ) -> {
26202621 TableConstraints constraints = bqTable .getTableConstraints ();
2621- if (constraints != null && constraints .getForeignKeys () != null ) {
2622- for (ForeignKey fk : constraints .getForeignKeys ()) {
2623- TableId pkTableId = fk .getReferencedTable ();
2624- if (equalsOrNullMatchesAll (parentCatalog , pkTableId .getProject ())
2625- && equalsOrNullMatchesAll (parentSchema , pkTableId .getDataset ())
2626- && parentTable .equals (pkTableId .getTable ())) {
2627- processForeignKey (fk , pkTableId , bqTable .getTableId (), results , fields );
2628- }
2622+ if (constraints == null || constraints .getForeignKeys () == null ) {
2623+ return ;
2624+ }
2625+ for (ForeignKey fk : constraints .getForeignKeys ()) {
2626+ TableId pkTableId = fk .getReferencedTable ();
2627+ if (!equalsOrNullMatchesAll (parentCatalog , pkTableId .getProject ())
2628+ || !equalsOrNullMatchesAll (parentSchema , pkTableId .getDataset ())
2629+ || !parentTable .equals (pkTableId .getTable ())) {
2630+ continue ;
26292631 }
2632+ processForeignKey (fk , pkTableId , bqTable .getTableId (), results , fields );
26302633 }
26312634 });
26322635
0 commit comments