From a2c20acf94501ff929716c4840bcdfd643b3196c Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 10 Feb 2011 11:34:16 +0000 Subject: [PATCH] Minor fixes once more --- plugins/dbms/mssqlserver/enumeration.py | 3 +++ plugins/dbms/oracle/enumeration.py | 3 +++ plugins/generic/enumeration.py | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py index e1bb3979c..920ad9efa 100644 --- a/plugins/dbms/mssqlserver/enumeration.py +++ b/plugins/dbms/mssqlserver/enumeration.py @@ -157,6 +157,9 @@ class Enumeration(GenericEnumeration): values = [ values ] for foundTbl in values: + if foundTbl is None: + continue + foundTbls[db].append(foundTbl) else: infoMsg = "fetching number of table" diff --git a/plugins/dbms/oracle/enumeration.py b/plugins/dbms/oracle/enumeration.py index ef109119f..762e6fde3 100644 --- a/plugins/dbms/oracle/enumeration.py +++ b/plugins/dbms/oracle/enumeration.py @@ -211,6 +211,9 @@ class Enumeration(GenericEnumeration): values = [ values ] for foundTbl in values: + if foundTbl is None: + continue + if foundTbl not in dbs[db]: dbs[db][foundTbl] = {} diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 0b33cef90..f2bdc19d0 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -1649,6 +1649,9 @@ class Enumeration: values = [ values ] for foundDb, foundTbl in values: + if foundDb is None or foundTbl is None: + continue + if foundDb in foundTbls: foundTbls[foundDb].append(foundTbl) else: @@ -1682,6 +1685,7 @@ class Enumeration: query += exclDbsQuery query = agent.limitQuery(index, query) foundDb = inject.getValue(query, inband=False, error=False) + if foundDb not in foundTbls: foundTbls[foundDb] = [] @@ -1799,6 +1803,9 @@ class Enumeration: values = [ values ] for foundDb, foundTbl in values: + if foundDb is None or foundTbl is None: + continue + if foundDb not in dbs: dbs[foundDb] = {}