Merge branch 'master' of https://github.com/ProjektA/infi.clickhouse_orm into ProjektA-master

This commit is contained in:
Itai Shirav 2020-06-23 11:33:16 +03:00
commit c5a083e2bc

View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import pytz import pytz
from copy import copy, deepcopy from copy import copy, deepcopy
from math import ceil from math import ceil
from .engines import CollapsingMergeTree from .engines import CollapsingMergeTree, ReplacingMergeTree
from datetime import date, datetime from datetime import date, datetime
from .utils import comma_join, string_or_func from .utils import comma_join, string_or_func
@ -540,8 +540,8 @@ class QuerySet(object):
Adds a FINAL modifier to table, meaning data will be collapsed to final version. Adds a FINAL modifier to table, meaning data will be collapsed to final version.
Can be used with `CollapsingMergeTree` engine only. Can be used with `CollapsingMergeTree` engine only.
""" """
if not isinstance(self._model_cls.engine, CollapsingMergeTree): if not isinstance(self._model_cls.engine, (CollapsingMergeTree, ReplacingMergeTree)):
raise TypeError('final() method can be used only with CollapsingMergeTree engine') raise TypeError('final() method can be used only with the CollapsingMergeTree and ReplacingMergeTree engines')
qs = copy(self) qs = copy(self)
qs._final = True qs._final = True