From d2bd275652eda6686648c13fd2e607fb3f0d1330 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Mon, 17 Dec 2012 14:07:28 +0000 Subject: [PATCH] refactoring --- plugins/generic/databases.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py index d1f729a36..45d4d4616 100644 --- a/plugins/generic/databases.py +++ b/plugins/generic/databases.py @@ -257,12 +257,11 @@ class Databases: if not Backend.isDbms(DBMS.SQLITE): query += " WHERE %s" % condition query += " IN (%s)" % ",".join("'%s'" % unsafeSQLIdentificatorNaming(db) for db in sorted(dbs)) - if conf.excludeSysDbs: - if Backend.isDbms(DBMS.SQLITE): - query += " WHERE " - query += " AND ".join("%s != '%s'" % (condition, unsafeSQLIdentificatorNaming(db)) 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) + + if conf.excludeSysDbs: + query += " AND ".join("%s != '%s'" % (condition, unsafeSQLIdentificatorNaming(db)) 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) if len(dbs) < 2 and ("%s," % condition) in query: query = query.replace("%s," % condition, "", 1)