Minor bug fix to correctly unpack user's custom queries on Microsoft SQL Server

bdamele · bdamele · commit dded57f1cd2d · 2009-01-30T23:58:48.000Z
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -476,7 +476,10 @@ def limitQuery(self, num, query, field):
 
             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:
