Compare commits

..

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

4 changed files with 2 additions and 12 deletions

View File

@ -1,14 +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
v2.1.1
------
- Improve support of ClickHouse v21.9 (mangototango)

View File

@ -30,7 +30,7 @@ homepage = https://github.com/Infinidat/infi.clickhouse_orm
[isolated-python]
recipe = infi.recipe.python
version = v3.8.12
version = v3.8.0.2
[setup.py]
recipe = infi.recipe.template.version

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)

View File

@ -292,7 +292,6 @@ class QuerySet(object):
Initializer. It is possible to create a queryset like this, but the standard
way is to use `MyModel.objects_in(database)`.
"""
self.model = model_cls
self._model_cls = model_cls
self._database = database
self._order_by = []