WHERE condition for error-based technique for --tables with --exclude-sysdbs was logically wrong, fixed now

bdamele · bdamele · commit 3c1cead4061e · 2012-12-17T14:06:12.000Z
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -254,14 +254,15 @@ def getTables(self, bruteForce=None):
             condition = rootQuery.inband.condition if 'condition' in rootQuery.inband else None
 
             if condition:
+                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:
-                    query += " WHERE "
+                    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)
-                elif not Backend.isDbms(DBMS.SQLITE):
-                    query += " WHERE %s" % condition
-                    query += " IN (%s)" % ",".join("'%s'" % unsafeSQLIdentificatorNaming(db) for db in sorted(dbs))
 
                 if len(dbs) < 2 and ("%s," % condition) in query:
                     query = query.replace("%s," % condition, "", 1)
