From 4d9dcbf5db40f1f081a18c3adac621bfaea22e59 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 1 Feb 2012 10:14:23 +0000 Subject: [PATCH] minor fix --- lib/techniques/union/use.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py index 0bc1b4845..dca6f7826 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -152,9 +152,9 @@ def unionUse(expression, unpack=True, dump=False): _, _, _, _, _, expressionFieldsList, expressionFields, _ = agent.getFields(origExpr) - if expressionFieldsList and len(expressionFieldsList) > 1 and " ORDER BY " in expression: + if expressionFieldsList and len(expressionFieldsList) > 1 and " ORDER BY " in expression.upper(): # No need for it in multicolumn dumps (one row is retrieved per request) and just slowing down on large table dumps - expression = expression[:expression.rindex(" ORDER BY ")] + expression = expression[:expression.upper().rindex(" ORDER BY ")] # We have to check if the SQL query might return multiple entries # and in such case forge the SQL limiting the query output one @@ -228,9 +228,9 @@ def unionUse(expression, unpack=True, dump=False): # Count the number of SQL query entries output countedExpression = expression.replace(expressionFields, queries[Backend.getIdentifiedDbms()].count.query % '*', 1) - if re.search(" ORDER BY ", expression, re.I): - untilOrderChar = countedExpression.index(" ORDER BY ") - countedExpression = countedExpression[:untilOrderChar] + if " ORDER BY " in countedExpression.upper(): + _ = countedExpression.upper().rindex(" ORDER BY ") + countedExpression = countedExpression[:_] count = resume(countedExpression, None) count = parseUnionPage(count)