Resolution of bug #1350392 - NullPointer if FK table not in analyzed …

…schema
kuali · Nov 8, 2005 · afd8672 · afd8672
1 parent 3cffee4
commit afd8672
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/net/sourceforge/schemaspy/model/Table.java b/src/net/sourceforge/schemaspy/model/Table.java
@@ -76,11 +76,21 @@ private void addForeignKey(ResultSet rs, Map tables, DatabaseMetaData meta) thro
         foreignKey.addChildColumn(childColumn);
 
         Table parentTable = (Table)tables.get(rs.getString("PKTABLE_NAME").toUpperCase());
-        TableColumn parentColumn = parentTable.getColumn(rs.getString("PKCOLUMN_NAME"));
-        foreignKey.addParentColumn(parentColumn);
 
-        childColumn.addParent(parentColumn, foreignKey);
-        parentColumn.addChild(childColumn, foreignKey);
+        if (parentTable != null) {
+            TableColumn parentColumn = parentTable.getColumn(rs.getString("PKCOLUMN_NAME"));
+
+            if (parentColumn != null) {
+                foreignKey.addParentColumn(parentColumn);
+
+                childColumn.addParent(parentColumn, foreignKey);
+                parentColumn.addChild(childColumn, foreignKey);
+            } else {
+                System.err.println("Couldn't add FK - Unknown Parent Column '" + rs.getString("PKCOLUMN_NAME") + "'");
+            }
+        } else {
+            System.err.println("Couldn't add FK - Unknown Parent Table '" + rs.getString("PKTABLE_NAME") + "'");
+        }
     }
 
     private void initPrimaryKeys(DatabaseMetaData meta) throws SQLException {