Bug 2857682 - Resolved problem where remote tables thought tables in …

…original schema were newly discovered remote tables.
kuali · Oct 5, 2009 · 7fa75cd · 7fa75cd
1 parent 36aaac0
commit 7fa75cd
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/net/sourceforge/schemaspy/model/Table.java b/src/net/sourceforge/schemaspy/model/Table.java
@@ -162,11 +162,15 @@ protected void addForeignKey(String fkName, String fkColName,
             foreignKey.addChildColumn(childColumn);
 
             Table parentTable = tables.get(pkTableName);
-            String otherSchema = pkTableSchema;
+            String parentSchema = pkTableSchema;
+            String baseSchema = Config.getInstance().getSchema();
+
             // if named table doesn't exist in this schema
             // or exists here but really referencing same named table in another schema
-            if (parentTable == null || (otherSchema != null && !otherSchema.equals(getSchema()))) {
-                parentTable = db.addRemoteTable(otherSchema, pkTableName, getSchema(),
+            if (parentTable == null ||
+                    (baseSchema != null && parentSchema != null &&
+                     !baseSchema.equals(parentSchema))) {
+                parentTable = db.addRemoteTable(parentSchema, pkTableName, baseSchema,
                                         properties, excludeIndirectColumns, excludeColumns);
             }