Wasn't corrently handling property file pseudo-inheritance when dumpi…

…ng db usage hints
kuali · Jun 9, 2005 · d05ce9a · d05ce9a
1 parent c82b0ea
commit d05ce9a
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/net/sourceforge/schemaspy/Main.java b/src/net/sourceforge/schemaspy/Main.java
@@ -492,10 +492,27 @@ private static void dumpUsage(String errorMessage, boolean detailed, boolean det
         if (detailedDb) {
             System.out.println("Built-in database types and their required connection parameters:");
             Set datatypes = getBuiltInDatabaseTypes(getLoadedFromJar());
+            class DbPropLoader {
+                Properties load(String dbType) {
+                    ResourceBundle bundle = ResourceBundle.getBundle(dbType);
+                    Properties properties;
+                    try {
+                        String baseDbType = bundle.getString("extends");
+                        int lastSlash = dbType.lastIndexOf('/');
+                        if (lastSlash != -1)
+                            baseDbType = dbType.substring(0, dbType.lastIndexOf("/") + 1) + baseDbType;
+                        properties = load(baseDbType);
+                    } catch (MissingResourceException doesntExtend) {
+                        properties = new Properties();
+                    }
+
+                    return add(properties, bundle);
+                }
+            }
+
             for (Iterator iter = datatypes.iterator(); iter.hasNext(); ) {
                 String dbType = iter.next().toString();
-                Properties properties = add(new Properties(), ResourceBundle.getBundle(dbType));
-                new ConnectionURLBuilder(dbType, null, properties).dumpUsage();
+                new ConnectionURLBuilder(dbType, null, new DbPropLoader().load(dbType)).dumpUsage();
             }
             System.out.println();
         }