bug fix for using --no-cast and --hex switches together

stamparm · stamparm · commit 775e424bf2bc · 2012-03-08T15:04:52.000Z
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -278,25 +278,26 @@ def nullAndCastField(self, field):
         @rtype: C{str}
         """
 
+        rootQuery = queries[Backend.getIdentifiedDbms()]
+
         if field.startswith("(CASE") or field.startswith("(IIF") or conf.noCast:
             nulledCastedField = field
         else:
-            _ = queries[Backend.getIdentifiedDbms()]
-            nulledCastedField = _.cast.query % field
+            nulledCastedField = rootQuery.cast.query % field
             if Backend.isDbms(DBMS.ACCESS):
-                nulledCastedField = _.isnull.query % (nulledCastedField, nulledCastedField)
+                nulledCastedField = rootQuery.isnull.query % (nulledCastedField, nulledCastedField)
             else:
-                nulledCastedField = _.isnull.query % nulledCastedField
+                nulledCastedField = rootQuery.isnull.query % nulledCastedField
 
-            if conf.hexConvert:
-                if 'hex' in _:
-                    nulledCastedField = _.hex.query % nulledCastedField
-                else:
-                    warnMsg = "switch '--hex' is currently not supported on DBMS '%s'. " % Backend.getIdentifiedDbms()
-                    warnMsg += "Going to switch it off"
-                    singleTimeWarnMessage(warnMsg)
+        if conf.hexConvert:
+            if 'hex' in rootQuery:
+                nulledCastedField = rootQuery.hex.query % nulledCastedField
+            else:
+                warnMsg = "switch '--hex' is currently not supported on DBMS '%s'. " % Backend.getIdentifiedDbms()
+                warnMsg += "Going to switch it off"
+                singleTimeWarnMessage(warnMsg)
 
-                    conf.hexConvert = False
+                conf.hexConvert = False
 
         return nulledCastedField
 
