Patch for an Issue #421

stamparm · stamparm · commit f0a419bdec06 · 2013-03-15T22:08:15.000+01:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -899,6 +899,7 @@ def limitQuery(self, num, query, field=None, uniqueField=None):
     def forgeQueryOutputLength(self, expression):
         lengthQuery = queries[Backend.getIdentifiedDbms()].length.query
         select = re.search("\ASELECT\s+", expression, re.I)
+        selectTopNotIntExpr = re.search("\ASELECT\s+TOP\s+[\d]+\s+(.+?)\s+FROM.+NOT IN", expression, re.I)
         selectTopExpr = re.search("\ASELECT\s+TOP\s+[\d]+\s+(.+?)\s+FROM", expression, re.I)
         selectFromExpr = re.search("\ASELECT\s+(.+?)\s+FROM", expression, re.I)
         selectExpr = re.search("\ASELECT\s+(.+)$", expression, re.I)
@@ -910,7 +911,9 @@ def forgeQueryOutputLength(self, expression):
         else:
             query = expression
 
-        if select:
+        if selectTopNotIntExpr:
+            lengthExpr = lengthQuery % ("(%s)" % expression)
+        elif select:
             lengthExpr = expression.replace(query, lengthQuery % query, 1)
         else:
             lengthExpr = lengthQuery % expression
