Merge pull request #64 from Aditya-upadhyay/bugfix/offsets_and_limit

Browse Source 
fixed bug with offsets and limits.
This commit is contained in:
Friedrich Lindenberg 2014-01-13 01:04:25 -08:00
commit e26bf57c39
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dataset/persistence/table.py
View File

@ -7,7 +7,7 @@ except ImportError:
from sqlalchemy.sql import and_, expression
from sqlalchemy.schema import Column, Index
from sqlalchemy import alias
from dataset.persistence.util import guess_type
from dataset.persistence.util import ResultIter
from dataset.util import DatasetException
@ -333,7 +333,7 @@ class Table(object):
args = self._args_to_clause(_filter)
# query total number of rows first
count_query = self.table.count(whereclause=args, limit=_limit, offset=_offset)
count_query = alias(self.table.select(whereclause=args, limit=_limit, offset=_offset), name='count_query_alias').count()
rp = self.database.executable.execute(count_query)
total_row_count = rp.fetchone()[0]
@ -353,8 +353,6 @@ class Table(object):
qlimit = min(_limit - (_step * i), _step)
if qlimit <= 0:
break
if qoffset > total_row_count:
break
queries.append(self.table.select(whereclause=args, limit=qlimit,
offset=qoffset, order_by=order_by))
return ResultIter((self.database.executable.execute(q) for q in queries))