Skip to content

Commit f5605f8

Browse files
fix rebase
1 parent cd1eb23 commit f5605f8

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

apps/framework-cli/src/infrastructure/olap/clickhouse.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2543,8 +2543,15 @@ SETTINGS enable_mixed_granularity_parts = 1, index_granularity = 8192, index_gra
25432543
ttl: None,
25442544
};
25452545

2546-
let sqls = build_modify_column_sql("test_db", "test_table", &sample_hash_col, false, false)
2547-
.unwrap();
2546+
let sqls = build_modify_column_sql(
2547+
"test_db",
2548+
"test_table",
2549+
&sample_hash_col,
2550+
false,
2551+
false,
2552+
None,
2553+
)
2554+
.unwrap();
25482555

25492556
assert_eq!(sqls.len(), 1);
25502557
// The fix ensures xxHash64(_id) is NOT quoted - if it were quoted, ClickHouse would treat it as a string literal
@@ -2565,8 +2572,9 @@ SETTINGS enable_mixed_granularity_parts = 1, index_granularity = 8192, index_gra
25652572
ttl: None,
25662573
};
25672574

2568-
let sqls = build_modify_column_sql("test_db", "test_table", &created_at_col, false, false)
2569-
.unwrap();
2575+
let sqls =
2576+
build_modify_column_sql("test_db", "test_table", &created_at_col, false, false, None)
2577+
.unwrap();
25702578

25712579
assert_eq!(sqls.len(), 1);
25722580
// The fix ensures now() is NOT quoted
@@ -2588,7 +2596,8 @@ SETTINGS enable_mixed_granularity_parts = 1, index_granularity = 8192, index_gra
25882596
};
25892597

25902598
let sqls =
2591-
build_modify_column_sql("test_db", "test_table", &status_col, false, false).unwrap();
2599+
build_modify_column_sql("test_db", "test_table", &status_col, false, false, None)
2600+
.unwrap();
25922601

25932602
assert_eq!(sqls.len(), 1);
25942603
// String literals should preserve their quotes

apps/framework-cli/src/infrastructure/olap/clickhouse/queries.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3085,6 +3085,7 @@ ENGINE = MergeTree
30853085
table_settings: None,
30863086
indexes: vec![],
30873087
table_ttl_setting: None,
3088+
cluster_name: None,
30883089
};
30893090

30903091
let query = create_table_query("test_db", table, false).unwrap();

0 commit comments

Comments
 (0)