Skip to content

Commit 17e829d

Browse files
Copilotgit-hulk
andauthored
Add line breaks for ON CLUSTER and ALTER clauses in beautify mode (#251)
--------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: git-hulk <4987594+git-hulk@users.noreply.github.com>
1 parent b2d2add commit 17e829d

36 files changed

Lines changed: 107 additions & 44 deletions

parser/format.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ func (a *AlterTable) FormatSQL(formatter *Formatter) {
211211
formatter.WriteString("ALTER TABLE ")
212212
formatter.WriteExpr(a.TableIdentifier)
213213
if a.OnCluster != nil {
214-
formatter.WriteByte(whitespace)
214+
formatter.Break()
215215
formatter.WriteExpr(a.OnCluster)
216216
}
217217
for i, expr := range a.AlterExprs {
218-
formatter.WriteByte(whitespace)
218+
formatter.Break()
219219
formatter.WriteExpr(expr)
220220
if i != len(a.AlterExprs)-1 {
221221
formatter.WriteString(",")

parser/testdata/ddl/format/beautify/alter_table_add_column.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD COLUMN f1 String
33

44

55
-- Beautify SQL:
6-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD COLUMN f1 String AFTER f0
6+
ALTER TABLE test.events_local
7+
ON CLUSTER 'default_cluster'
8+
ADD COLUMN f1 String AFTER f0
79
SETTINGS
810
alter_sync=2;

parser/testdata/ddl/format/beautify/alter_table_add_index.sql

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@ ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX output_idx
77

88

99
-- Beautify SQL:
10-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX my_index(f0) TYPE minmax GRANULARITY 1024;
11-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2;
12-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3;
13-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1;
14-
ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2;
10+
ALTER TABLE test.events_local
11+
ON CLUSTER 'default_cluster'
12+
ADD INDEX my_index(f0) TYPE minmax GRANULARITY 1024;
13+
ALTER TABLE test.events_local
14+
ON CLUSTER 'default_cluster'
15+
ADD INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2;
16+
ALTER TABLE test.events_local
17+
ON CLUSTER 'default_cluster'
18+
ADD INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3;
19+
ALTER TABLE test.events_local
20+
ON CLUSTER 'default_cluster'
21+
ADD INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1;
22+
ALTER TABLE test.events_local
23+
ON CLUSTER 'default_cluster'
24+
ADD INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2;

parser/testdata/ddl/format/beautify/alter_table_add_projection.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ ADD PROJECTION IF NOT EXISTS user_name_projection
55

66

77
-- Beautify SQL:
8-
ALTER TABLE visits_order ADD PROJECTION IF NOT EXISTS user_name_projection (SELECT * GROUP BY
8+
ALTER TABLE visits_order
9+
ADD PROJECTION IF NOT EXISTS user_name_projection (SELECT * GROUP BY
910
user_name ORDER BY user_name) AFTER a.user_id;

parser/testdata/ddl/format/beautify/alter_table_attach_partition.sql

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ALTER TABLE test ATTACH PARTITION ID '20210114';
66

77

88
-- Beautify SQL:
9-
ALTER TABLE test ATTACH PARTITION '20210114';
10-
ALTER TABLE test ATTACH PARTITION '20210114' FROM test1;
11-
ALTER TABLE test ATTACH PARTITION '20210114';
9+
ALTER TABLE test
10+
ATTACH PARTITION '20210114';
11+
ALTER TABLE test
12+
ATTACH PARTITION '20210114' FROM test1;
13+
ALTER TABLE test
14+
ATTACH PARTITION '20210114';

parser/testdata/ddl/format/beautify/alter_table_clear_column.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
ALTER TABLE my_table CLEAR COLUMN my_column_name IN PARTITION partition_name;
33

44
-- Beautify SQL:
5-
ALTER TABLE my_table CLEAR COLUMN my_column_name IN PARTITION partition_name;
5+
ALTER TABLE my_table
6+
CLEAR COLUMN my_column_name IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_clear_index.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
ALTER TABLE my_table CLEAR INDEX my_index_name IN PARTITION partition_name;
33

44
-- Beautify SQL:
5-
ALTER TABLE my_table CLEAR INDEX my_index_name IN PARTITION partition_name;
5+
ALTER TABLE my_table
6+
CLEAR INDEX my_index_name IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_clear_projection.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
ALTER TABLE my_table CLEAR PROJECTION hello IN PARTITION partition_name;
33

44
-- Beautify SQL:
5-
ALTER TABLE my_table CLEAR PROJECTION hello IN PARTITION partition_name;
5+
ALTER TABLE my_table
6+
CLEAR PROJECTION hello IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_delete.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ ALTER TABLE test.events DELETE WHERE created_at < '2023-01-01';
33

44

55
-- Beautify SQL:
6-
ALTER TABLE test.events DELETE WHERE created_at < '2023-01-01';
6+
ALTER TABLE test.events
7+
DELETE WHERE created_at < '2023-01-01';

parser/testdata/ddl/format/beautify/alter_table_delete_with_cluster.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ ALTER TABLE test.events ON CLUSTER 'default_cluster' DELETE WHERE id = 123 AND s
33

44

55
-- Beautify SQL:
6-
ALTER TABLE test.events ON CLUSTER 'default_cluster' DELETE WHERE id = 123
6+
ALTER TABLE test.events
7+
ON CLUSTER 'default_cluster'
8+
DELETE WHERE id = 123
79
AND
810
status = 'deleted';

0 commit comments

Comments
 (0)