minor bug fix

This commit is contained in:
Miroslav Stampar 2012-03-08 15:24:05 +00:00
parent c79807f5fb
commit 2ab80bfb2c
2 changed files with 4 additions and 4 deletions

View File

@ -314,7 +314,7 @@ class Enumeration(GenericEnumeration):
conf.tbl = foundTbl conf.tbl = foundTbl
conf.col = column conf.col = column
self.getColumns(onlyColNames=True) self.getColumns(onlyColNames=True, bruteForce=False)
if db in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[db]\ if db in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[db]\
and not isNoneValue(kb.data.cachedColumns[db][foundTbl]): and not isNoneValue(kb.data.cachedColumns[db][foundTbl]):
@ -371,7 +371,7 @@ class Enumeration(GenericEnumeration):
conf.tbl = tbl conf.tbl = tbl
conf.col = column conf.col = column
self.getColumns(onlyColNames=True) self.getColumns(onlyColNames=True, bruteForce=False)
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]: if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl]) dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])

View File

@ -2222,7 +2222,7 @@ class Enumeration:
conf.tbl = foundTbl conf.tbl = foundTbl
conf.col = column conf.col = column
self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam)) self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam), bruteForce=False)
if foundDb in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[foundDb]: if foundDb in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[foundDb]:
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl]) dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl])
@ -2327,7 +2327,7 @@ class Enumeration:
conf.tbl = tbl conf.tbl = tbl
conf.col = column conf.col = column
self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam)) self.getColumns(onlyColNames=True, colTuple=(colConsider, colCondParam), bruteForce=False)
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]: if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl]) dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])