few minor fixes

This commit is contained in:
Miroslav Stampar 2012-02-20 10:24:55 +00:00
parent bc4dd7c0dd
commit 08bf8c201f
2 changed files with 4 additions and 4 deletions

View File

@ -633,7 +633,7 @@ fufuh <fufuh@users.sourceforge.net>
for reporting a bug when running on Windows for reporting a bug when running on Windows
Hans Wurst <wurstwass0r@googlemail.com> Hans Wurst <wurstwass0r@googlemail.com>
for reporting a bug for reporting a couple of bugs
james <james@ev6.net> james <james@ev6.net>
for reporting a bug for reporting a bug

View File

@ -572,7 +572,7 @@ class Enumeration:
count = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=2) count = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=2)
if not isNumPosStrValue(count): if not isNumPosStrValue(count):
if not (isinstance(count, basestring) and count.isdigit()) and Backend.isDbms(DBMS.ORACLE) and not query2: if Backend.isDbms(DBMS.ORACLE) and not query2:
infoMsg = "trying with table USER_SYS_PRIVS" infoMsg = "trying with table USER_SYS_PRIVS"
logger.info(infoMsg) logger.info(infoMsg)
@ -1320,7 +1320,7 @@ class Enumeration:
count = inject.getValue(query, expected=EXPECTED.INT, charsetType=2) count = inject.getValue(query, expected=EXPECTED.INT, charsetType=2)
if count is not None and isinstance(count, basestring) and count.isdigit(): if isNumPosStrValue(count):
if safeSQLIdentificatorNaming(db) not in kb.data.cachedCounts: if safeSQLIdentificatorNaming(db) not in kb.data.cachedCounts:
kb.data.cachedCounts[safeSQLIdentificatorNaming(db)] = {} kb.data.cachedCounts[safeSQLIdentificatorNaming(db)] = {}
@ -1672,7 +1672,7 @@ class Enumeration:
lengths = {} lengths = {}
entries = {} entries = {}
if count == "0": if count == 0:
warnMsg = "table '%s' " % unsafeSQLIdentificatorNaming(tbl) warnMsg = "table '%s' " % unsafeSQLIdentificatorNaming(tbl)
warnMsg += "on database '%s' " % unsafeSQLIdentificatorNaming(conf.db) warnMsg += "on database '%s' " % unsafeSQLIdentificatorNaming(conf.db)
warnMsg += "appears to be empty" warnMsg += "appears to be empty"