diff --git a/lib/core/agent.py b/lib/core/agent.py index f9b72b397..57ff0edac 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -680,10 +680,15 @@ class Agent(object): stopLimit = None limitCond = True - limitRegExp = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query, expression, re.I) - limitRegExp2 = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query2, expression, re.I) topLimit = re.search("TOP\s+([\d]+)\s+", expression, re.I) + limitRegExp = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query, expression, re.I) + + if hasattr(queries[Backend.getIdentifiedDbms()].limitregexp, "query2"): + limitRegExp2 = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query2, expression, re.I) + else: + limitRegExp2 = None + if (limitRegExp or limitRegExp2) or (Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) and topLimit): if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.SQLITE): limitGroupStart = queries[Backend.getIdentifiedDbms()].limitgroupstart.query