Minor update

lib/controller/handler.py

@@ -71,9 +71,9 @@ def setHandler():
         items.remove(_)
         items.insert(0, _)
 
-    for name, aliases, Handler, Connector in items:
+    for dbms, aliases, Handler, Connector in items:
-        if conf.dbms and conf.dbms not in aliases:
+        if conf.dbms and conf.dbms.lower() != dbms.lower():
-            debugMsg = "skipping test for %s" % name
+            debugMsg = "skipping test for %s" % dbms
             logger.debug(debugMsg)
             continue
 
@@ -84,7 +84,7 @@ def setHandler():
             logger.debug("forcing timeout to 10 seconds")
             conf.timeout = 10
 
-            dialect = DBMS_DICT[name][3]
+            dialect = DBMS_DICT[dbms][3]
 
             if dialect:
                 sqlalchemy = SQLAlchemy(dialect=dialect)

plugins/dbms/access/fingerprint.py

@@ -146,7 +146,7 @@ class Fingerprint(GenericFingerprint):
         return value
 
     def checkDbms(self):
-        if not conf.extensiveFp and (Backend.isDbmsWithin(ACCESS_ALIASES) or conf.dbms in ACCESS_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(ACCESS_ALIASES) or (conf.dbms or "").lower() in ACCESS_ALIASES):
             setDbms(DBMS.ACCESS)
 
             return True

plugins/dbms/db2/fingerprint.py

@@ -81,7 +81,7 @@ class Fingerprint(GenericFingerprint):
         return value
 
     def checkDbms(self):
-        if not conf.extensiveFp and (Backend.isDbmsWithin(DB2_ALIASES) or conf.dbms in DB2_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(DB2_ALIASES) or (conf.dbms or "").lower() in DB2_ALIASES):
             setDbms(DBMS.DB2)
 
             return True

plugins/dbms/firebird/fingerprint.py

@@ -104,7 +104,7 @@ class Fingerprint(GenericFingerprint):
 
     def checkDbms(self):
         if not conf.extensiveFp and (Backend.isDbmsWithin(FIREBIRD_ALIASES) \
-           or conf.dbms in FIREBIRD_ALIASES) and Backend.getVersion() and \
+           or (conf.dbms or "").lower() in FIREBIRD_ALIASES) and Backend.getVersion() and \
            Backend.getVersion() != UNKNOWN_DBMS_VERSION:
             v = Backend.getVersion().replace(">", "")
             v = v.replace("=", "")

plugins/dbms/hsqldb/fingerprint.py

@@ -81,7 +81,7 @@ class Fingerprint(GenericFingerprint):
         """
 
         if not conf.extensiveFp and (Backend.isDbmsWithin(HSQLDB_ALIASES) \
-           or conf.dbms in HSQLDB_ALIASES) and Backend.getVersion() and \
+           or (conf.dbms or "").lower() in HSQLDB_ALIASES) and Backend.getVersion() and \
            Backend.getVersion() != UNKNOWN_DBMS_VERSION:
             v = Backend.getVersion().replace(">", "")
             v = v.replace("=", "")

plugins/dbms/maxdb/fingerprint.py

@@ -91,7 +91,7 @@ class Fingerprint(GenericFingerprint):
         return value
 
     def checkDbms(self):
-        if not conf.extensiveFp and (Backend.isDbmsWithin(MAXDB_ALIASES) or conf.dbms in MAXDB_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(MAXDB_ALIASES) or (conf.dbms or "").lower() in MAXDB_ALIASES):
             setDbms(DBMS.MAXDB)
 
             self.getBanner()

plugins/dbms/mssqlserver/fingerprint.py

@@ -66,7 +66,7 @@ class Fingerprint(GenericFingerprint):
 
     def checkDbms(self):
         if not conf.extensiveFp and (Backend.isDbmsWithin(MSSQL_ALIASES) \
-           or conf.dbms in MSSQL_ALIASES) and Backend.getVersion() and \
+           or (conf.dbms or "").lower() in MSSQL_ALIASES) and Backend.getVersion() and \
            Backend.getVersion().isdigit():
             setDbms("%s %s" % (DBMS.MSSQL, Backend.getVersion()))
 

plugins/dbms/mysql/fingerprint.py

@@ -143,7 +143,7 @@ class Fingerprint(GenericFingerprint):
         """
 
         if not conf.extensiveFp and (Backend.isDbmsWithin(MYSQL_ALIASES) \
-           or conf.dbms in MYSQL_ALIASES) and Backend.getVersion() and \
+           or (conf.dbms or "").lower() in MYSQL_ALIASES) and Backend.getVersion() and \
            Backend.getVersion() != UNKNOWN_DBMS_VERSION:
             v = Backend.getVersion().replace(">", "")
             v = v.replace("=", "")

plugins/dbms/oracle/fingerprint.py

@@ -58,7 +58,7 @@ class Fingerprint(GenericFingerprint):
         return value
 
     def checkDbms(self):
-        if not conf.extensiveFp and (Backend.isDbmsWithin(ORACLE_ALIASES) or conf.dbms in ORACLE_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(ORACLE_ALIASES) or (conf.dbms or "").lower() in ORACLE_ALIASES):
             setDbms(DBMS.ORACLE)
 
             self.getBanner()

plugins/dbms/postgresql/fingerprint.py

@@ -63,7 +63,7 @@ class Fingerprint(GenericFingerprint):
         * http://www.postgresql.org/docs/9.1/interactive/release.html (up to 9.1.3)
         """
 
-        if not conf.extensiveFp and (Backend.isDbmsWithin(PGSQL_ALIASES) or conf.dbms in PGSQL_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(PGSQL_ALIASES) or (conf.dbms or "").lower() in PGSQL_ALIASES):
             setDbms(DBMS.PGSQL)
 
             self.getBanner()

plugins/dbms/sqlite/fingerprint.py

@@ -64,7 +64,7 @@ class Fingerprint(GenericFingerprint):
         * http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions
         """
 
-        if not conf.extensiveFp and (Backend.isDbmsWithin(SQLITE_ALIASES) or conf.dbms in SQLITE_ALIASES):
+        if not conf.extensiveFp and (Backend.isDbmsWithin(SQLITE_ALIASES) or (conf.dbms or "").lower() in SQLITE_ALIASES):
             setDbms(DBMS.SQLITE)
 
             self.getBanner()

plugins/dbms/sybase/fingerprint.py

@@ -59,7 +59,7 @@ class Fingerprint(GenericFingerprint):
 
     def checkDbms(self):
         if not conf.extensiveFp and (Backend.isDbmsWithin(SYBASE_ALIASES) \
-           or conf.dbms in SYBASE_ALIASES) and Backend.getVersion() and \
+           or (conf.dbms or "").lower() in SYBASE_ALIASES) and Backend.getVersion() and \
            Backend.getVersion().isdigit():
             setDbms("%s %s" % (DBMS.SYBASE, Backend.getVersion()))