From 01014eca1751bc14fb31764fb293ec937f187ede Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 23 Aug 2011 21:45:01 +0000
Subject: [PATCH] by request

---
 lib/core/agent.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/core/agent.py b/lib/core/agent.py
index 83684c2b0..364e2b863 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -281,13 +281,13 @@ class Agent:
 
         # SQLite version 2 does not support neither CAST() nor IFNULL(),
         # introduced only in SQLite version 3
-        if Backend.isDbms(DBMS.SQLITE):
+        if Backend.isDbms(DBMS.SQLITE) or conf.noCast:
             return field
 
         if field.startswith("(CASE") or field.startswith("(IIF"):
             nulledCastedField = field
         else:
-            nulledCastedField = (queries[Backend.getIdentifiedDbms()].cast.query % field) if not conf.noCast else field
+            nulledCastedField = queries[Backend.getIdentifiedDbms()].cast.query % field
             if Backend.isDbms(DBMS.ACCESS):
                 nulledCastedField = queries[Backend.getIdentifiedDbms()].isnull.query % (nulledCastedField, nulledCastedField)
             else: