Compare commits

..

No commits in common. "develop" and "v2.1.2" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -1,10 +1,6 @@
Change Log
==========
v2.1.3
------
- Fix pagination for models with alias columns
v2.1.2
------
- Add `QuerySet.model` to support django-rest-framework 3

View File

@ -319,8 +319,7 @@ class Database(object):
elif page_num < 1:
raise ValueError('Invalid page number: %d' % page_num)
offset = (page_num - 1) * page_size
query = 'SELECT {} FROM $table'.format(", ".join(model_class.fields().keys()))
query = 'SELECT * FROM $table'
if conditions:
if isinstance(conditions, Q):
conditions = conditions.to_sql(model_class)