diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/Database.java b/symmetric-db/src/main/java/org/jumpmind/db/model/Database.java index f0846f5cc7..808f44749b 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/model/Database.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/model/Database.java @@ -116,15 +116,12 @@ public static List sortByForeignKeys(List
tables, Map resolvedPosition = new HashMap(); - if (tablePrefix == null) { tablePrefix = "sym"; } - tablePrefix = tablePrefix.toLowerCase(); - for(Table t : tables) { - if (t != null && !t.getNameLowerCase().startsWith(tablePrefix)) { + if (t != null) { depth.setValue(1); parentPosition.setValue(-1); resolveForeginKeyOrder(t, allTables, resolved, temporary, finalList, null, missingDependencyMap, - dependencyMap, depth, position, tablePrefix, resolvedPosition, parentPosition); + dependencyMap, depth, position, resolvedPosition, parentPosition); } } @@ -134,7 +131,7 @@ public static List
sortByForeignKeys(List
tables, Map allTables, Set
resolved, Set
temporary, List
finalList, Table parentTable, Map> missingDependencyMap, - Map> dependencyMap, MutableInt depth, MutableInt position, String tablePrefix, + Map> dependencyMap, MutableInt depth, MutableInt position, Map resolvedPosition, MutableInt parentPosition) { if (resolved.contains(t)) { @@ -170,7 +167,7 @@ public static void resolveForeginKeyOrder(Table t, Map allTables, if (fkTable != t) { depth.increment(); resolveForeginKeyOrder(fkTable, allTables, resolved, temporary, finalList, t, missingDependencyMap, - dependencyMap, depth, position, tablePrefix, resolvedPosition, parentPosition); + dependencyMap, depth, position, resolvedPosition, parentPosition); Integer resolvedParentTableChannel = resolvedPosition.get(fkTable); if (resolvedParentTableChannel != null) { parentTablesChannels.add(resolvedParentTableChannel);