This commit is contained in:
Bernardo Damele 2010-11-12 10:02:02 +00:00
parent 306e96331d
commit 66c82d72e4
11 changed files with 19 additions and 19 deletions

View File

@ -540,7 +540,7 @@ class Agent:
limitStr = queries[kb.dbms].limit.query % (num+1, num+1) limitStr = queries[kb.dbms].limit.query % (num+1, num+1)
limitedQuery += " %s" % limitStr limitedQuery += " %s" % limitStr
elif kb.dbms == DMBS.ORACLE: elif kb.dbms == DBMS.ORACLE:
if " ORDER BY " in limitedQuery and "(SELECT " in limitedQuery: if " ORDER BY " in limitedQuery and "(SELECT " in limitedQuery:
orderBy = limitedQuery[limitedQuery.index(" ORDER BY "):] orderBy = limitedQuery[limitedQuery.index(" ORDER BY "):]
limitedQuery = limitedQuery[:limitedQuery.index(" ORDER BY ")] limitedQuery = limitedQuery[:limitedQuery.index(" ORDER BY ")]

View File

@ -1420,7 +1420,7 @@ def getCompiledRegex(regex, *args):
def getPartRun(): def getPartRun():
""" """
Goes through call stack and finds constructs matching conf.dmbsHandler.*. Goes through call stack and finds constructs matching conf.dbmsHandler.*.
Returns it or its alias used in txt/common-outputs.txt Returns it or its alias used in txt/common-outputs.txt
""" """

View File

@ -172,7 +172,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not Microsoft Access" warnMsg = "the back-end DBMS is not Microsoft Access"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -185,7 +185,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not Microsoft Access" warnMsg = "the back-end DBMS is not Microsoft Access"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -127,7 +127,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not Firebird" warnMsg = "the back-end DBMS is not Firebird"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -143,7 +143,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not Firebird" warnMsg = "the back-end DBMS is not Firebird"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -129,7 +129,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not SAP MaxDB" warnMsg = "the back-end DBMS is not SAP MaxDB"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -145,7 +145,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not SAP MaxDB" warnMsg = "the back-end DBMS is not SAP MaxDB"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -144,7 +144,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not Microsoft SQL Server" warnMsg = "the back-end DBMS is not Microsoft SQL Server"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -168,7 +168,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not MySQL" warnMsg = "the back-end DBMS is not MySQL"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -248,7 +248,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not MySQL" warnMsg = "the back-end DBMS is not MySQL"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -96,7 +96,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not Oracle" warnMsg = "the back-end DBMS is not Oracle"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -122,7 +122,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not Oracle" warnMsg = "the back-end DBMS is not Oracle"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -97,7 +97,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not PostgreSQL" warnMsg = "the back-end DBMS is not PostgreSQL"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -142,7 +142,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not PostgreSQL" warnMsg = "the back-end DBMS is not PostgreSQL"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -91,7 +91,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not SQLite" warnMsg = "the back-end DBMS is not SQLite"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -108,7 +108,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not SQLite" warnMsg = "the back-end DBMS is not SQLite"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False

View File

@ -90,7 +90,7 @@ class Fingerprint(GenericFingerprint):
result = Request.queryPage(payload) result = Request.queryPage(payload)
if not result: if not result:
warnMsg = "the back-end DMBS is not Sybase" warnMsg = "the back-end DBMS is not Sybase"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False
@ -113,7 +113,7 @@ class Fingerprint(GenericFingerprint):
return True return True
else: else:
warnMsg = "the back-end DMBS is not Sybase" warnMsg = "the back-end DBMS is not Sybase"
logger.warn(warnMsg) logger.warn(warnMsg)
return False return False