mirror of
https://github.com/Infinidat/infi.clickhouse_orm.git
synced 2025-07-31 18:29:47 +03:00
Compare commits
No commits in common. "develop" and "v2.1.2" have entirely different histories.
|
@ -1,10 +1,6 @@
|
||||||
Change Log
|
Change Log
|
||||||
==========
|
==========
|
||||||
|
|
||||||
v2.1.3
|
|
||||||
------
|
|
||||||
- Fix pagination for models with alias columns
|
|
||||||
|
|
||||||
v2.1.2
|
v2.1.2
|
||||||
------
|
------
|
||||||
- Add `QuerySet.model` to support django-rest-framework 3
|
- Add `QuerySet.model` to support django-rest-framework 3
|
||||||
|
|
|
@ -319,8 +319,7 @@ class Database(object):
|
||||||
elif page_num < 1:
|
elif page_num < 1:
|
||||||
raise ValueError('Invalid page number: %d' % page_num)
|
raise ValueError('Invalid page number: %d' % page_num)
|
||||||
offset = (page_num - 1) * page_size
|
offset = (page_num - 1) * page_size
|
||||||
query = 'SELECT {} FROM $table'.format(", ".join(model_class.fields().keys()))
|
query = 'SELECT * FROM $table'
|
||||||
|
|
||||||
if conditions:
|
if conditions:
|
||||||
if isinstance(conditions, Q):
|
if isinstance(conditions, Q):
|
||||||
conditions = conditions.to_sql(model_class)
|
conditions = conditions.to_sql(model_class)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user