Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dc2ee8b

Browse files
stamparmstamparm
committed
Minor update
1 parent 177fc03 commit dc2ee8b

12 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎lib/controller/handler.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ def setHandler():
7171
items.remove(_)
7272
items.insert(0, _)
7373

74-
for name, aliases, Handler, Connector in items:
75-
if conf.dbms and conf.dbms not in aliases:
76-
debugMsg = "skipping test for %s" % name
74+
for dbms, aliases, Handler, Connector in items:
75+
if conf.dbms and conf.dbms.lower() != dbms.lower():
76+
debugMsg = "skipping test for %s" % dbms
7777
logger.debug(debugMsg)
7878
continue
7979

@@ -84,7 +84,7 @@ def setHandler():
8484
logger.debug("forcing timeout to 10 seconds")
8585
conf.timeout = 10
8686

87-
dialect = DBMS_DICT[name][3]
87+
dialect = DBMS_DICT[dbms][3]
8888

8989
if dialect:
9090
sqlalchemy = SQLAlchemy(dialect=dialect)

‎plugins/dbms/access/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def getFingerprint(self):
146146
return value
147147

148148
def checkDbms(self):
149-
if not conf.extensiveFp and (Backend.isDbmsWithin(ACCESS_ALIASES) or conf.dbms in ACCESS_ALIASES):
149+
if not conf.extensiveFp and (Backend.isDbmsWithin(ACCESS_ALIASES) or (conf.dbms or "").lower() in ACCESS_ALIASES):
150150
setDbms(DBMS.ACCESS)
151151

152152
return True

‎plugins/dbms/db2/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def getFingerprint(self):
8181
return value
8282

8383
def checkDbms(self):
84-
if not conf.extensiveFp and (Backend.isDbmsWithin(DB2_ALIASES) or conf.dbms in DB2_ALIASES):
84+
if not conf.extensiveFp and (Backend.isDbmsWithin(DB2_ALIASES) or (conf.dbms or "").lower() in DB2_ALIASES):
8585
setDbms(DBMS.DB2)
8686

8787
return True

‎plugins/dbms/firebird/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def _dialectCheck(self):
104104

105105
def checkDbms(self):
106106
if not conf.extensiveFp and (Backend.isDbmsWithin(FIREBIRD_ALIASES) \
107-
or conf.dbms in FIREBIRD_ALIASES) and Backend.getVersion() and \
107+
or (conf.dbms or "").lower() in FIREBIRD_ALIASES) and Backend.getVersion() and \
108108
Backend.getVersion() != UNKNOWN_DBMS_VERSION:
109109
v = Backend.getVersion().replace(">", "")
110110
v = v.replace("=", "")

‎plugins/dbms/hsqldb/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def checkDbms(self):
8181
"""
8282

8383
if not conf.extensiveFp and (Backend.isDbmsWithin(HSQLDB_ALIASES) \
84-
or conf.dbms in HSQLDB_ALIASES) and Backend.getVersion() and \
84+
or (conf.dbms or "").lower() in HSQLDB_ALIASES) and Backend.getVersion() and \
8585
Backend.getVersion() != UNKNOWN_DBMS_VERSION:
8686
v = Backend.getVersion().replace(">", "")
8787
v = v.replace("=", "")

‎plugins/dbms/maxdb/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def getFingerprint(self):
9191
return value
9292

9393
def checkDbms(self):
94-
if not conf.extensiveFp and (Backend.isDbmsWithin(MAXDB_ALIASES) or conf.dbms in MAXDB_ALIASES):
94+
if not conf.extensiveFp and (Backend.isDbmsWithin(MAXDB_ALIASES) or (conf.dbms or "").lower() in MAXDB_ALIASES):
9595
setDbms(DBMS.MAXDB)
9696

9797
self.getBanner()

‎plugins/dbms/mssqlserver/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def getFingerprint(self):
6666

6767
def checkDbms(self):
6868
if not conf.extensiveFp and (Backend.isDbmsWithin(MSSQL_ALIASES) \
69-
or conf.dbms in MSSQL_ALIASES) and Backend.getVersion() and \
69+
or (conf.dbms or "").lower() in MSSQL_ALIASES) and Backend.getVersion() and \
7070
Backend.getVersion().isdigit():
7171
setDbms("%s %s" % (DBMS.MSSQL, Backend.getVersion()))
7272

‎plugins/dbms/mysql/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def checkDbms(self):
143143
"""
144144

145145
if not conf.extensiveFp and (Backend.isDbmsWithin(MYSQL_ALIASES) \
146-
or conf.dbms in MYSQL_ALIASES) and Backend.getVersion() and \
146+
or (conf.dbms or "").lower() in MYSQL_ALIASES) and Backend.getVersion() and \
147147
Backend.getVersion() != UNKNOWN_DBMS_VERSION:
148148
v = Backend.getVersion().replace(">", "")
149149
v = v.replace("=", "")

‎plugins/dbms/oracle/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def getFingerprint(self):
5858
return value
5959

6060
def checkDbms(self):
61-
if not conf.extensiveFp and (Backend.isDbmsWithin(ORACLE_ALIASES) or conf.dbms in ORACLE_ALIASES):
61+
if not conf.extensiveFp and (Backend.isDbmsWithin(ORACLE_ALIASES) or (conf.dbms or "").lower() in ORACLE_ALIASES):
6262
setDbms(DBMS.ORACLE)
6363

6464
self.getBanner()

‎plugins/dbms/postgresql/fingerprint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def checkDbms(self):
6363
* http://www.postgresql.org/docs/9.1/interactive/release.html (up to 9.1.3)
6464
"""
6565

66-
if not conf.extensiveFp and (Backend.isDbmsWithin(PGSQL_ALIASES) or conf.dbms in PGSQL_ALIASES):
66+
if not conf.extensiveFp and (Backend.isDbmsWithin(PGSQL_ALIASES) or (conf.dbms or "").lower() in PGSQL_ALIASES):
6767
setDbms(DBMS.PGSQL)
6868

6969
self.getBanner()

0 commit comments

Comments
 (0)