Removing a hard limit to use --start/--stop only for --dump scenarios

This commit is contained in:
Miroslav Stampar 2015-09-28 11:11:39 +02:00
parent ac467bc453
commit 906cb6d3c2
2 changed files with 6 additions and 7 deletions

View File

@ -1370,7 +1370,7 @@ def expandAsteriskForColumns(expression):
return expression return expression
def getLimitRange(count, dump=False, plusOne=False): def getLimitRange(count, plusOne=False):
""" """
Returns range of values used in limit/offset constructs Returns range of values used in limit/offset constructs
@ -1382,12 +1382,11 @@ def getLimitRange(count, dump=False, plusOne=False):
count = int(count) count = int(count)
limitStart, limitStop = 1, count limitStart, limitStop = 1, count
if dump: if isinstance(conf.limitStop, int) and conf.limitStop > 0 and conf.limitStop < limitStop:
if isinstance(conf.limitStop, int) and conf.limitStop > 0 and conf.limitStop < limitStop: limitStop = conf.limitStop
limitStop = conf.limitStop
if isinstance(conf.limitStart, int) and conf.limitStart > 0 and conf.limitStart <= limitStop: if isinstance(conf.limitStart, int) and conf.limitStart > 0 and conf.limitStart <= limitStop:
limitStart = conf.limitStart limitStart = conf.limitStart
retVal = xrange(limitStart, limitStop + 1) if plusOne else xrange(limitStart - 1, limitStop) retVal = xrange(limitStart, limitStop + 1) if plusOne else xrange(limitStart - 1, limitStop)

View File

@ -275,7 +275,7 @@ class Entries:
else: else:
emptyColumns = [] emptyColumns = []
plusOne = Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2) plusOne = Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2)
indexRange = getLimitRange(count, dump=True, plusOne=plusOne) indexRange = getLimitRange(count, plusOne=plusOne)
if len(colList) < len(indexRange) > CHECK_ZERO_COLUMNS_THRESHOLD: if len(colList) < len(indexRange) > CHECK_ZERO_COLUMNS_THRESHOLD:
for column in colList: for column in colList: