From c79807f5fb34c5fa6104b5487dc0963e1558bd70 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 8 Mar 2012 15:11:24 +0000 Subject: [PATCH] Minor layout adjustments --- lib/core/dump.py | 2 ++ plugins/generic/enumeration.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/core/dump.py b/lib/core/dump.py index 6b587f7b9..cf6141863 100644 --- a/lib/core/dump.py +++ b/lib/core/dump.py @@ -214,6 +214,8 @@ class Dump: self._write("| %s%s |" % (table, blank)) self._write("+%s+\n" % lines) + elif dbTables is None or len(dbTables) == 0: + print "No tables found" else: self.string("tables", dbTables) diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index e609deb37..4eae2ce33 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -2009,20 +2009,20 @@ class Enumeration: if tblConsider == "1": infoMsg += "s like" infoMsg += " '%s'" % unsafeSQLIdentificatorNaming(tbl) - logger.info(infoMsg) if conf.db and conf.db != CURRENT_DB: _ = conf.db.split(",") whereDbsQuery = "".join(" AND '%s' = %s" % (unsafeSQLIdentificatorNaming(db), dbCond) for db in _) - infoMsg = "for database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) - logger.info(infoMsg) + infoMsg += " for database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) elif conf.excludeSysDbs: whereDbsQuery = "".join(" AND '%s' != %s" % (unsafeSQLIdentificatorNaming(db), dbCond) for db in self.excludeDbsList) - infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) - logger.info(infoMsg) + infoMsg2 = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) + logger.info(infoMsg2) else: whereDbsQuery = "" + logger.info(infoMsg) + tblQuery = "%s%s" % (tblCond, tblCondParam) tblQuery = tblQuery % tbl @@ -2176,22 +2176,22 @@ class Enumeration: if colConsider == "1": infoMsg += "s like" infoMsg += " '%s'" % unsafeSQLIdentificatorNaming(column) - logger.info(infoMsg) foundCols[column] = {} if conf.db and conf.db != CURRENT_DB: _ = conf.db.split(",") whereDbsQuery = "".join(" AND '%s' = %s" % (unsafeSQLIdentificatorNaming(db), dbCond) for db in _) - infoMsg = "for database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) - logger.info(infoMsg) + infoMsg += " for database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) elif conf.excludeSysDbs: whereDbsQuery = "".join(" AND '%s' != %s" % (unsafeSQLIdentificatorNaming(db), dbCond) for db in self.excludeDbsList) - infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) - logger.info(infoMsg) + infoMsg2 = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) + logger.info(infoMsg2) else: whereDbsQuery = "" + logger.info(infoMsg) + colQuery = "%s%s" % (colCond, colCondParam) colQuery = colQuery % unsafeSQLIdentificatorNaming(column)