Added switch --schema to enumerate DBMS schema and now --columns does not require a mandatory table (-T) anymore, instead it will act as an alias for --schema

lib/controller/action.py

@@ -90,14 +90,11 @@ def action():
     if conf.getTables:
         conf.dumper.dbTables(conf.dbmsHandler.getTables())
 
-    if conf.commonTables:
-        conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
-
     if conf.getColumns:
         conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns())
 
-    if conf.commonColumns:
-        conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
+    if conf.getSchema:
+        conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema())
 
     if conf.dumpTable:
         conf.dumper.dbTableValues(conf.dbmsHandler.dumpTable())
@@ -114,6 +111,13 @@ def action():
     if conf.sqlShell:
         conf.dbmsHandler.sqlShell()
 
+    # Brute force options
+    if conf.commonTables:
+        conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
+
+    if conf.commonColumns:
+        conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
+
     # User-defined function options
     if conf.udfInject:
         conf.dbmsHandler.udfInjectCustom()

lib/core/optiondict.py

@@ -92,6 +92,7 @@ optDict = {
                                "getDbs":            ("boolean", "Databases"),
                                "getTables":         ("boolean", "Tables"),
                                "getColumns":        ("boolean", "Columns"),
+                               "getSchema":         "boolean",
                                "dumpTable":         "boolean",
                                "dumpAll":           "boolean",
                                "search":            "boolean",

lib/parse/cmdline.py

@@ -276,6 +276,9 @@ def cmdLineParser():
         enumeration.add_option("--columns", dest="getColumns", action="store_true",
                                default=False, help="Enumerate DBMS database table columns")
 
+        enumeration.add_option("--schema", dest="getSchema", action="store_true",
+                               default=False, help="Enumerate DBMS schema")
+
         enumeration.add_option("--dump", dest="dumpTable", action="store_true",
                                default=False, help="Dump DBMS database table entries")