From f3858a5fcf3105d32db69d63d27cd48bf8cf2884 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 24 Mar 2011 17:08:14 +0000 Subject: [PATCH] another fix related to the bug reported by Alone Shell --- lib/core/agent.py | 8 ++++---- plugins/generic/enumeration.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 05cf1f343..894eaebac 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -674,15 +674,15 @@ class Agent: if forgeNotIn: limitedQuery = limitedQuery.replace("SELECT ", (limitStr % 1), 1) - if uniqueField and " ORDER BY " not in fromFrom: + if " ORDER BY " not in fromFrom: # Reference: http://vorg.ca/626-the-MS-SQL-equivalent-to-MySQLs-limit-command if " WHERE " in limitedQuery: - limitedQuery = "%s AND %s " % (limitedQuery, uniqueField) + limitedQuery = "%s AND %s " % (limitedQuery, uniqueField or field) else: - limitedQuery = "%s WHERE ISNULL(%s,' ') " % (limitedQuery, uniqueField) + limitedQuery = "%s WHERE ISNULL(%s,' ') " % (limitedQuery, uniqueField or field) limitedQuery += "NOT IN (%s" % (limitStr % num) - limitedQuery += "ISNULL(%s,' ') %s ORDER BY %s) ORDER BY %s" % (uniqueField, fromFrom, uniqueField, uniqueField) + limitedQuery += "ISNULL(%s,' ') %s ORDER BY %s) ORDER BY %s" % (uniqueField or field, fromFrom, uniqueField or field, uniqueField or field) else: if " WHERE " in limitedQuery: limitedQuery = "%s AND %s " % (limitedQuery, field) diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index cadce05a5..bdbc00ca2 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -1078,7 +1078,7 @@ class Enumeration: elif Backend.getIdentifiedDbms() == DBMS.MSSQL: query = rootQuery.blind.query2 % (conf.db, conf.db, conf.db, conf.db, column, conf.db, - conf.db, conf.db, conf.tbl) + conf.db, conf.db, conf.tbl if '.' not in conf.tbl else conf.tbl.split('.')[1]) elif Backend.getIdentifiedDbms() == DBMS.FIREBIRD: query = rootQuery.blind.query2 % (conf.tbl, column)