Finished Release v2.1.3

Fix pagination for models with alias fields

CHANGELOG.md

@@ -1,6 +1,14 @@
 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)

buildout.cfg

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

src/infi/clickhouse_orm/database.py

@@ -319,7 +319,8 @@ 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'
+        query = 'SELECT {} FROM $table'.format(", ".join(model_class.fields().keys()))
+        
         if conditions:
             if isinstance(conditions, Q):
                 conditions = conditions.to_sql(model_class)

src/infi/clickhouse_orm/query.py

@@ -292,6 +292,7 @@ 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 = []