Fix for SQLite --columns with multiple tables (-T a,b)

This commit is contained in:
Miroslav Štampar 2026-11-12 14:31:18 +01:00
parent 04e1162d5a
commit d49202eaf1
3 changed files with 8 additions and 8 deletions

View file

@ -704,9 +704,9 @@ class Databases(object):
if dumpMode and colList:
if conf.db not in kb.data.cachedColumns:
kb.data.cachedColumns[conf.db] = {}
kb.data.cachedColumns[conf.db][safeSQLIdentificatorNaming(conf.tbl, True)] = dict((_, None) for _ in colList)
kb.data.cachedColumns[conf.db][safeSQLIdentificatorNaming(tbl, True)] = dict((_, None) for _ in colList)
else:
parseSqliteTableSchema(unArrayizeValue(values))
parseSqliteTableSchema(unArrayizeValue(values), tbl)
elif not isNoneValue(values):
table = {}
@ -813,13 +813,13 @@ class Databases(object):
if dumpMode and colList:
if conf.db not in kb.data.cachedColumns:
kb.data.cachedColumns[conf.db] = {}
kb.data.cachedColumns[conf.db][safeSQLIdentificatorNaming(conf.tbl, True)] = dict((_, None) for _ in colList)
kb.data.cachedColumns[conf.db][safeSQLIdentificatorNaming(tbl, True)] = dict((_, None) for _ in colList)
else:
query = rootQuery.blind.query % unsafeSQLIdentificatorNaming(tbl)
value = unArrayizeValue(inject.getValue(query, union=False, error=False))
parseSqliteTableSchema(unArrayizeValue(value))
parseSqliteTableSchema(unArrayizeValue(value), tbl)
return kb.data.cachedColumns
continue
table = {}
columns = {}