Infinidat/infi.clickhouse_orm
1
1
Fork 0
mirror of https://github.com/Infinidat/infi.clickhouse_orm.git synced 2025-02-19 09:50:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 2 bugs in Merge engine:

Browse Source 
1) If database name contained some signes (+, -) create merge table failed.
2) When merge table was created and set_database was not previously called, "currentDatabase()" was also used, which could lead to errors on multiple databases.
This commit is contained in:
M1ha 2017-09-18 15:53:15 +05:00
parent 430872b958
commit 0391482ec7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/infi/clickhouse_orm/engines.py
View File

@ -146,10 +146,11 @@ class Merge(Engine):
self.table_regex = table_regex self.table_regex = table_regex
# Use current database as default # Use current database as default
self.db_name = 'currentDatabase()' self.db_name = None
def create_table_sql(self): def create_table_sql(self):
return "Merge(%s, '%s')" % (self.db_name, self.table_regex) db_name = ("`%s`" % self.db_name) if self.db_name else 'currentDatabase()'
return "Merge(%s, '%s')" % (db_name, self.table_regex)
def set_db_name(self, db_name): def set_db_name(self, db_name):
assert isinstance(db_name, six.string_types), "'db_name' parameter must be string" assert isinstance(db_name, six.string_types), "'db_name' parameter must be string"

6
src/infi/clickhouse_orm/models.py
View File

@ -274,3 +274,9 @@ class MergeModel(Model):
res = super(MergeModel, self).set_database(db) res = super(MergeModel, self).set_database(db)
self.engine.set_db_name(db.db_name) self.engine.set_db_name(db.db_name)
return res return res
@classmethod
def create_table_sql(cls, db_name):
assert isinstance(cls.engine, Merge), "engine must be engines.Merge instance"
cls.engine.set_db_name(db_name)
return super(MergeModel, cls).create_table_sql(db_name)