From 28cd78fac43da87599881953e79f0ad7b537714a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Notin?= Date: Wed, 6 Feb 2019 18:19:38 +0100 Subject: [PATCH] Dump table if columns are unknown but the user specified them with the -C option Fix #3471 --- plugins/generic/entries.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py index de51d97f3..11515ef5d 100644 --- a/plugins/generic/entries.py +++ b/plugins/generic/entries.py @@ -129,7 +129,8 @@ class Entries: else: kb.dumpTable = "%s.%s" % (conf.db, tbl) - if safeSQLIdentificatorNaming(conf.db) not in kb.data.cachedColumns or safeSQLIdentificatorNaming(tbl, True) not in kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)] or not kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)][safeSQLIdentificatorNaming(tbl, True)]: + if (safeSQLIdentificatorNaming(conf.db) not in kb.data.cachedColumns or safeSQLIdentificatorNaming(tbl, True) not in kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)] or not kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)][safeSQLIdentificatorNaming(tbl, True)])\ + and conf.col == "": warnMsg = "unable to enumerate the columns for table " warnMsg += "'%s' in database" % unsafeSQLIdentificatorNaming(tbl) warnMsg += " '%s'" % unsafeSQLIdentificatorNaming(conf.db) @@ -141,6 +142,9 @@ class Entries: columns = kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)][safeSQLIdentificatorNaming(tbl, True)] colList = sorted(column for column in columns if column) + if not colList and conf.col != "": + colList = conf.col.split(",") + if conf.exclude: colList = [_ for _ in colList if _ not in conf.exclude.split(',')]