Merge pull request #80 from sdrenn/minor-fix

named arguments should go after positional
xzkostyan · Feb 15, 2020 · 76ec893 · 76ec893
2 parents 2162dd9 + 59e3fb8
commit 76ec893
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/clickhouse_sqlalchemy/engines.py b/clickhouse_sqlalchemy/engines.py
@@ -177,9 +177,10 @@ def get_parameters(self):
 
 class ReplacingMergeTree(MergeTree):
     def __init__(self,
-                 version_col=None,
                  *args,
                  **kwargs):
+
+        version_col = kwargs.pop('version_col', None)
         super(ReplacingMergeTree, self).__init__(
             *args, **kwargs
         )

diff --git a/tests/test_engines.py b/tests/test_engines.py
@@ -248,9 +248,9 @@ class TestTable(self.base):
 
             __table_args__ = (
                 engines.ReplacingMergeTree(
-                    'version',
                     'date',
                     ('date', 'x'),
+                    version_col='version',
                 ),
             )
 
@@ -274,7 +274,8 @@ class TestTable(self.base):
             __table_args__ = (
                 engines.ReplicatedReplacingMergeTree(
                     '/table/path', 'name',
-                    'version', 'date', ('date', 'x'),
+                    'date', ('date', 'x'),
+                    version_col='version',
                 ),
             )
 
@@ -299,7 +300,7 @@ class TestTable(self.base):
 
             __table_args__ = (
                 engines.ReplacingMergeTree(
-                    version,
+                    version_col=version,
                     partition_by=func.toYYYYMM(date),
                     order_by=(date, x),
                 ),