From cfcf8a3abbdc7a52104659066ad5529546d9f422 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 31 Jan 2013 13:49:19 +0100
Subject: [PATCH] Another update for an Issue #380 (--common-... switches)
---
lib/core/agent.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/core/agent.py b/lib/core/agent.py
index 9cd727eca..7f58ed48d 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -426,6 +426,10 @@ class Agent(object):
fieldsMinMaxstr = re.search(r"(?:MIN|MAX)\(([^\(\)]+)\)", query, re.I)
fieldsNoSelect = query
+ _ = zeroDepthSearch(query, " FROM ")
+ if not _:
+ fieldsSelectFrom = None
+
if fieldsSubstr:
fieldsToCastStr = query
elif fieldsMinMaxstr:
@@ -441,7 +445,6 @@ class Agent(object):
elif fieldsSelectCase:
fieldsToCastStr = fieldsSelectCase.groups()[0]
elif fieldsSelectFrom:
- _ = zeroDepthSearch(query, " FROM ")
fieldsToCastStr = query[:unArrayizeValue(_)] if _ else query
fieldsToCastStr = re.sub(r"\ASELECT%s\s+" % prefixRegex, "", fieldsToCastStr)
elif fieldsSelect: