Minor layout adjustments - foundDb is misleading at that stage

This commit is contained in:
Bernardo Damele 2012-03-15 16:07:16 +00:00
parent ddd92476a8
commit 0013b0970f

View File

@ -2212,35 +2212,35 @@ class Enumeration:
for tbl in conf.tbl.split(","): for tbl in conf.tbl.split(","):
values.append([db, tbl]) values.append([db, tbl])
for foundDb, foundTbl in filterPairValues(values): for db, tbl in filterPairValues(values):
foundDb = safeSQLIdentificatorNaming(foundDb) db = safeSQLIdentificatorNaming(db)
foundTbls = foundTbl.split(",") tbls = tbl.split(",")
for foundTbl in foundTbls: for tbl in tbls:
foundTbl = safeSQLIdentificatorNaming(foundTbl, True) tbl = safeSQLIdentificatorNaming(tbl, True)
if foundDb is None or foundTbl is None: if db is None or tbl is None:
continue continue
conf.db = foundDb conf.db = db
conf.tbl = foundTbl conf.tbl = tbl
conf.col = column conf.col = column
self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam), bruteForce=False) self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam), bruteForce=False)
if foundDb in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[foundDb]: if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
if foundDb not in dbs: if db not in dbs:
dbs[foundDb] = {} dbs[db] = {}
if foundTbl not in dbs[foundDb]: if tbl not in dbs[db]:
dbs[foundDb][foundTbl] = {} dbs[db][tbl] = {}
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl]) dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
if foundDb in foundCols[column]: if db in foundCols[column]:
foundCols[column][foundDb].append(foundTbl) foundCols[column][db].append(tbl)
else: else:
foundCols[column][foundDb] = [foundTbl] foundCols[column][db] = [tbl]
kb.data.cachedColumns = {} kb.data.cachedColumns = {}
else: else: