From d19787cb9fa83a82d92fbf6bbe7dc3e1917e8a03 Mon Sep 17 00:00:00 2001 From: emakarov Date: Tue, 7 Feb 2017 20:41:26 +0300 Subject: [PATCH] Fix for create_table_sql for Buffer table --- src/infi/clickhouse_orm/engines.py | 4 ++-- src/infi/clickhouse_orm/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/infi/clickhouse_orm/engines.py b/src/infi/clickhouse_orm/engines.py index d07b2ed..aab4c39 100644 --- a/src/infi/clickhouse_orm/engines.py +++ b/src/infi/clickhouse_orm/engines.py @@ -80,11 +80,11 @@ class Buffer(Engine): self.max_bytes = max_bytes - def create_table_sql(self, db_name, target): + def create_table_sql(self, db_name, main_model): # Overriden create_table_sql example: #sql = 'ENGINE = Buffer(merge, hits, 16, 10, 100, 10000, 1000000, 10000000, 100000000)' sql = 'ENGINE = Buffer(%s, %s, %d, %d, %d, %d, %d, %d, %d)' % ( - db_name, target.table_name(), self.num_layers, + db_name, main_model.table_name(), self.num_layers, self.min_time, self.max_time, self.min_rows, self.max_rows, self.min_bytes, self.max_bytes ) diff --git a/src/infi/clickhouse_orm/models.py b/src/infi/clickhouse_orm/models.py index da79073..e7cfcb9 100644 --- a/src/infi/clickhouse_orm/models.py +++ b/src/infi/clickhouse_orm/models.py @@ -168,6 +168,6 @@ class BufferModel(Model): Returns the SQL command for creating a table for this model. ''' parts = ['CREATE TABLE IF NOT EXISTS `%s`.`%s` AS `%s`.`%s`' % (db_name, cls.table_name(), db_name, cls.main_model.table_name())] - engine_str = cls.engine.create_table_sql(db_name, cls) + engine_str = cls.engine.create_table_sql(db_name, cls.main_model) parts.append(engine_str) return ' '.join(parts)