Actually brute-force switches make more sense just after their "normal" version. Also, getSchema() method is preferably to be called before getColumns(), see next commit for reason

This commit is contained in:
Bernardo Damele 2011-04-29 21:09:07 +00:00
parent 46f96f3c4c
commit a23ca952e4

View File

@ -90,12 +90,18 @@ def action():
if conf.getTables: if conf.getTables:
conf.dumper.dbTables(conf.dbmsHandler.getTables()) conf.dumper.dbTables(conf.dbmsHandler.getTables())
if conf.getColumns: if conf.commonTables:
conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns()) conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
if conf.getSchema: if conf.getSchema:
conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema()) conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema())
if conf.getColumns:
conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns())
if conf.commonColumns:
conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
if conf.dumpTable: if conf.dumpTable:
conf.dumper.dbTableValues(conf.dbmsHandler.dumpTable()) conf.dumper.dbTableValues(conf.dbmsHandler.dumpTable())
@ -111,13 +117,6 @@ def action():
if conf.sqlShell: if conf.sqlShell:
conf.dbmsHandler.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 # User-defined function options
if conf.udfInject: if conf.udfInject:
conf.dbmsHandler.udfInjectCustom() conf.dbmsHandler.udfInjectCustom()