From b33d6ab4e81ab114519b511a5b6ef4b05b344830 Mon Sep 17 00:00:00 2001 From: johncurrier Date: Thu, 25 Sep 2008 05:43:46 +0000 Subject: [PATCH] Pass -rails param when using -all --- src/net/sourceforge/schemaspy/Config.java | 2 ++ src/net/sourceforge/schemaspy/SchemaAnalyzer.java | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/net/sourceforge/schemaspy/Config.java b/src/net/sourceforge/schemaspy/Config.java index 741f191..df4d836 100644 --- a/src/net/sourceforge/schemaspy/Config.java +++ b/src/net/sourceforge/schemaspy/Config.java @@ -1150,6 +1150,8 @@ public List asList() throws IOException { list.add("-norows"); if (isRankDirBugEnabled()) list.add("-rankdirbug"); + if (isRailsEnabled()) + list.add("-rails"); if (!isAdsEnabled()) list.add("-noads"); diff --git a/src/net/sourceforge/schemaspy/SchemaAnalyzer.java b/src/net/sourceforge/schemaspy/SchemaAnalyzer.java index b401504..eb7347d 100644 --- a/src/net/sourceforge/schemaspy/SchemaAnalyzer.java +++ b/src/net/sourceforge/schemaspy/SchemaAnalyzer.java @@ -213,13 +213,12 @@ public int analyze(Config config) throws Exception { // getting implied constraints has a side-effect of associating the parent/child tables, so don't do it // here unless they want that behavior List impliedConstraints = null; - if (config.isRailsEnabled()) { - DbAnalyzer.getRailsConstraints(db.getTablesByName()); - impliedConstraints = new ArrayList(); - } else if (includeImpliedConstraints) + if (includeImpliedConstraints) impliedConstraints = DbAnalyzer.getImpliedConstraints(tables); else impliedConstraints = new ArrayList(); + if (config.isRailsEnabled()) + DbAnalyzer.getRailsConstraints(db.getTablesByName()); List orphans = DbAnalyzer.getOrphans(tables); boolean hasOrphans = !orphans.isEmpty() && Dot.getInstance().isValid();