From dded57f1cd2dd2e1831506b92e33902c354b2c31 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Fri, 30 Jan 2009 23:58:48 +0000
Subject: [PATCH] Minor bug fix to correctly unpack user's custom queries on
 Microsoft SQL Server

---
 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 8f678af87..5c0de2c75 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -476,7 +476,10 @@ class Agent:
 
             if not limitedQuery.startswith("SELECT TOP ") and not limitedQuery.startswith("TOP "):
                 limitedQuery  = limitedQuery.replace("SELECT ", (limitStr % 1), 1)
-                limitedQuery  = "%s WHERE %s " % (limitedQuery, field)
+                if " WHERE " in limitedQuery:
+                    limitedQuery  = "%s AND %s " % (limitedQuery, field)
+                else:
+                    limitedQuery  = "%s WHERE %s " % (limitedQuery, field)
                 limitedQuery += "NOT IN (%s" % (limitStr % num)
                 limitedQuery += "%s %s)" % (field, fromFrom)
             else: