From c58dc4a6d8bf3746a9ae27dd5a052df2f24bf842 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Tue, 3 May 2011 14:13:45 +0000 Subject: [PATCH] isDbmsWithin() must stay like this, no getIdentifiedDbms() in there --- lib/core/common.py | 7 +------ plugins/dbms/oracle/fingerprint.py | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 21f687c15..61453bd53 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -429,12 +429,7 @@ class Backend: @staticmethod def isDbmsWithin(aliases): - if Backend.getDbms() is not None: - return Backend.getDbms().lower() in aliases - elif Backend.getIdentifiedDbms() is not None: - return Backend.getIdentifiedDbms().lower() in aliases - else: - return False + return Backend.getDbms() is not None and Backend.getDbms().lower() in aliases @staticmethod def isVersion(version): diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py index 5e754f40c..d2215c5ca 100644 --- a/plugins/dbms/oracle/fingerprint.py +++ b/plugins/dbms/oracle/fingerprint.py @@ -63,6 +63,10 @@ class Fingerprint(GenericFingerprint): return value def checkDbms(self): + print "Backend.getDbms():", Backend.getDbms() + print "Backend.isDbmsWithin(ORACLE_ALIASES):", Backend.isDbmsWithin(ORACLE_ALIASES) + print "conf.dbms:", conf.dbms + if not conf.extensiveFp and (Backend.isDbmsWithin(ORACLE_ALIASES) or conf.dbms in ORACLE_ALIASES): setDbms(DBMS.ORACLE)