Fix order of cluster and engine for create db

wandb · Dec 11, 2024 · a7b6539 · a7b6539
1 parent 8091546
commit a7b6539
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/trace_server/test_clickhouse_trace_server_migrator.py b/tests/trace_server/test_clickhouse_trace_server_migrator.py
@@ -163,7 +163,7 @@ def test_create_db_sql_replicated(mock_costs, migrator):
 
     sql = migrator._create_db_sql("test_db")
     expected = """
-        CREATE DATABASE IF NOT EXISTS test_db ENGINE=Replicated('/clickhouse/tables/test_db', '{shard}', '{replica}') ON CLUSTER test_cluster
+        CREATE DATABASE IF NOT EXISTS test_db ON CLUSTER test_cluster ENGINE=Replicated('/clickhouse/tables/test_db', '{shard}', '{replica}')
     """.strip()
     assert sql.strip() == expected
 

diff --git a/weave/trace_server/clickhouse_trace_server_migrator.py b/weave/trace_server/clickhouse_trace_server_migrator.py
@@ -83,13 +83,13 @@ def _create_db_sql(self, db_name: str) -> str:
             ):
                 raise MigrationError(f"Invalid replicated path: {replicated_path}")
 
+            replicated_cluster = f" ON CLUSTER {self.replicated_cluster}"
             replicated_engine = (
                 f" ENGINE=Replicated('{replicated_path}', '{{shard}}', '{{replica}}')"
             )
-            replicated_cluster = f" ON CLUSTER {self.replicated_cluster}"
 
         create_db_sql = f"""
-            CREATE DATABASE IF NOT EXISTS {db_name}{replicated_engine}{replicated_cluster}
+            CREATE DATABASE IF NOT EXISTS {db_name}{replicated_cluster}{replicated_engine}
         """
         return create_db_sql