Add line break and indentation for SETTINGS clause in beautify mode (#245)

Copilot · git-hulk · web-flow · commit 033e8735215a · 2026-02-13T11:54:17.000+08:00
---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: git-hulk &lt;4987594+git-hulk@users.noreply.github.com&gt;
Co-authored-by: hulk &lt;hulk.website@gmail.com&gt;
diff --git a/parser/format.go b/parser/format.go
@@ -224,7 +224,7 @@ func (a *AlterTableAddColumn) FormatSQL(formatter *Formatter) {
 		formatter.WriteExpr(a.After)
 	}
 	if a.Settings != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(a.Settings)
 	}
 }
@@ -310,7 +310,7 @@ func (a *AlterTableDetachPartition) FormatSQL(formatter *Formatter) {
 	formatter.WriteString("DETACH ")
 	formatter.WriteExpr(a.Partition)
 	if a.Settings != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(a.Settings)
 	}
 }
@@ -338,7 +338,7 @@ func (a *AlterTableDropPartition) FormatSQL(formatter *Formatter) {
 	}
 	formatter.WriteExpr(a.Partition)
 	if a.Settings != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(a.Settings)
 	}
 }
@@ -858,7 +858,12 @@ func (c *CreateMaterializedView) FormatSQL(formatter *Formatter) {
 		formatter.WriteExpr(c.Settings)
 	}
 	if c.HasAppend {
-		formatter.WriteString(" APPEND")
+		if c.Settings != nil {
+			formatter.Break()
+		} else {
+			formatter.WriteByte(whitespace)
+		}
+		formatter.WriteString("APPEND")
 	}
 	if c.Engine != nil {
 		formatter.WriteExpr(c.Engine)
@@ -2307,13 +2312,18 @@ func (s *SettingPair) FormatSQL(formatter *Formatter) {
 }
 
 func (s *SettingsClause) FormatSQL(formatter *Formatter) {
-	formatter.WriteString("SETTINGS ")
+	formatter.WriteString("SETTINGS")
+	formatter.Indent()
 	for i, item := range s.Items {
-		if i > 0 {
-			formatter.WriteString(", ")
+		if i == 0 {
+			formatter.Break()
+		} else {
+			formatter.WriteByte(',')
+			formatter.Break()
 		}
 		formatter.WriteExpr(item)
 	}
+	formatter.Dedent()
 }
 
 func (s *ShowStmt) FormatSQL(formatter *Formatter) {
diff --git a/parser/testdata/ddl/format/beautify/alter_table_add_column.sql b/parser/testdata/ddl/format/beautify/alter_table_add_column.sql
@@ -3,4 +3,6 @@ ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD COLUMN f1 String
 
 
 -- Beautify SQL:
-ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD COLUMN f1 String AFTER f0 SETTINGS alter_sync=2;
+ALTER TABLE test.events_local ON CLUSTER 'default_cluster' ADD COLUMN f1 String AFTER f0
+SETTINGS
+  alter_sync=2;
diff --git a/parser/testdata/ddl/format/beautify/alter_table_drop_detach_partition.sql b/parser/testdata/ddl/format/beautify/alter_table_drop_detach_partition.sql
@@ -2,4 +2,6 @@
 ALTER TABLE app_utc_00.app_message_as_notification_organization_sent_stats_i_d_local DROP DETACHED PARTITION '2022-05-24' SETTINGS allow_drop_detached = 1;
 
 -- Beautify SQL:
-ALTER TABLE app_utc_00.app_message_as_notification_organization_sent_stats_i_d_local DROP DETACHED PARTITION '2022-05-24' SETTINGS allow_drop_detached=1;
+ALTER TABLE app_utc_00.app_message_as_notification_organization_sent_stats_i_d_local DROP DETACHED PARTITION '2022-05-24'
+SETTINGS
+  allow_drop_detached=1;
diff --git a/parser/testdata/ddl/format/beautify/create_distributed_table.sql b/parser/testdata/ddl/format/beautify/create_distributed_table.sql
@@ -14,4 +14,5 @@ ENGINE = Distributed(
 CREATE TABLE test.event_all ON CLUSTER 'default_cluster'
  AS test.evnets_local
 ENGINE = Distributed(default_cluster, test, events_local, rand())
-SETTINGS fsync_after_insert=0;
+SETTINGS
+  fsync_after_insert=0;
diff --git a/parser/testdata/ddl/format/beautify/create_materialized_view_with_refresh.sql b/parser/testdata/ddl/format/beautify/create_materialized_view_with_refresh.sql
@@ -16,7 +16,11 @@ AS SELECT
 FROM table_v5
 
 -- Beautify SQL:
-CREATE MATERIALIZED VIEW fresh_mv REFRESH EVERY 1 HOUR OFFSET 10 MINUTE RANDOMIZE FOR 1 SECOND DEPENDS ON table_v5 SETTINGS randomize_for=1, randomize_offset=10, randomize_period=1 APPEND TO target_table_name EMPTY AS SELECT
+CREATE MATERIALIZED VIEW fresh_mv REFRESH EVERY 1 HOUR OFFSET 10 MINUTE RANDOMIZE FOR 1 SECOND DEPENDS ON table_v5 SETTINGS
+  randomize_for=1,
+  randomize_offset=10,
+  randomize_period=1
+APPEND TO target_table_name EMPTY AS SELECT
   `field_1`,
   `field_2`,
   `field_3`,
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_codec_delta.sql b/parser/testdata/ddl/format/beautify/create_table_with_codec_delta.sql
@@ -34,4 +34,9 @@ ORDER BY
   (toUnixTimestamp64Nano(`timestamp`), `api_id`)
 PARTITION BY toStartOfHour(`timestamp`)
 TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY
-SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1;
+SETTINGS
+  execute_merges_on_single_replica_time_threshold=1200,
+  index_granularity=16384,
+  max_bytes_to_merge_at_max_space_in_pool=64424509440,
+  storage_policy='main',
+  ttl_only_drop_parts=1;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_enum_fields.sql b/parser/testdata/ddl/format/beautify/create_table_with_enum_fields.sql
@@ -21,4 +21,5 @@ ORDER BY
   (method, timestamp)
 PARTITION BY toDate(timestamp)
 TTL toDate(timestamp) + toIntervalDay(3)
-SETTINGS index_granularity=8192;
+SETTINGS
+  index_granularity=8192;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_index.sql b/parser/testdata/ddl/format/beautify/create_table_with_index.sql
@@ -46,4 +46,9 @@ ORDER BY
   (toUnixTimestamp64Nano(`timestamp`), `api_id`)
 PARTITION BY toStartOfHour(`timestamp`)
 TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY
-SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1;
+SETTINGS
+  execute_merges_on_single_replica_time_threshold=1200,
+  index_granularity=16384,
+  max_bytes_to_merge_at_max_space_in_pool=64424509440,
+  storage_policy='main',
+  ttl_only_drop_parts=1;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_keyword_partition_by.sql b/parser/testdata/ddl/format/beautify/create_table_with_keyword_partition_by.sql
@@ -21,4 +21,5 @@ ENGINE = ReplacingMergeTree
 ORDER BY
   (f1, f2)
 PARTITION BY date
-SETTINGS index_granularity=8192;
+SETTINGS
+  index_granularity=8192;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_nullable.sql b/parser/testdata/ddl/format/beautify/create_table_with_nullable.sql
@@ -29,4 +29,5 @@ ENGINE = MergeTree
 ORDER BY
   label_id
 PARTITION BY xxHash32(tag_id) % 20
-SETTINGS index_granularity=8192;
+SETTINGS
+  index_granularity=8192;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_sample_by.sql b/parser/testdata/ddl/format/beautify/create_table_with_sample_by.sql
@@ -23,4 +23,5 @@ ORDER BY
   (contractid, toDate(timestamp), userid)
 PARTITION BY toYYYYMM(timestamp)
 SAMPLE BY userid
-SETTINGS index_granularity=8192;
+SETTINGS
+  index_granularity=8192;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_ttl_policy.sql b/parser/testdata/ddl/format/beautify/create_table_with_ttl_policy.sql
@@ -67,4 +67,7 @@ ORDER BY
   tuple()
 PARTITION BY key
 TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPRESS CODEC(LZ4HC(10))
-SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0, allow_experimental_replacing_merge_with_cleanup=true;
+SETTINGS
+  min_rows_for_wide_part=0,
+  min_bytes_for_wide_part=0,
+  allow_experimental_replacing_merge_with_cleanup=true;
diff --git a/parser/testdata/ddl/format/beautify/create_table_with_tuple_fields.sql b/parser/testdata/ddl/format/beautify/create_table_with_tuple_fields.sql
@@ -22,4 +22,5 @@ CREATE TABLE t0 ON CLUSTER default_cluster
 ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}', '{replica}')
 ORDER BY
   (tup1, tup2, tup3)
-SETTINGS index_granularity=8192;
+SETTINGS
+  index_granularity=8192;
diff --git a/parser/testdata/ddl/format/beautify/create_with_time_zone.sql b/parser/testdata/ddl/format/beautify/create_with_time_zone.sql
@@ -87,4 +87,6 @@ ORDER BY
   (ts_bucket, service_name, name, toUnixTimestamp64Nano(timestamp))
 PARTITION BY toDate(timestamp)
 TTL toDate(timestamp) + toIntervalDay(15)
-SETTINGS index_granularity=8192, ttl_only_drop_parts=1;
+SETTINGS
+  index_granularity=8192,
+  ttl_only_drop_parts=1;
diff --git a/parser/testdata/query/format/beautify/select_with_settings_additional_table_filters.sql b/parser/testdata/query/format/beautify/select_with_settings_additional_table_filters.sql
@@ -19,22 +19,26 @@ SELECT
   *
 FROM
   test_table
-SETTINGS additional_table_filters={'test_table': 'status = 1'};
+SETTINGS
+  additional_table_filters={'test_table': 'status = 1'};
 SELECT
   *
 FROM
   test_table
-SETTINGS additional_table_filters={'test_table': 'value = \'test\''};
+SETTINGS
+  additional_table_filters={'test_table': 'value = \'test\''};
 SELECT
   *
 FROM
   test_table
-SETTINGS additional_table_filters={'test_table': 'value = ''test'''};
+SETTINGS
+  additional_table_filters={'test_table': 'value = ''test'''};
 SELECT
   *
 FROM
   test_table
-SETTINGS additional_table_filters={'test_table': 'id IN (\'a\', \'b\') AND status = \'active\''}
+SETTINGS
+  additional_table_filters={'test_table': 'id IN (\'a\', \'b\') AND status = \'active\''}
 FORMAT JSON;
 SELECT
   number,
@@ -52,4 +56,5 @@ FROM
       y
     FROM
       table_1) AS s ON f.number = s.x
-SETTINGS additional_table_filters={'system.numbers': 'number != 3', 'table_1': 'x != 2'};
+SETTINGS
+  additional_table_filters={'system.numbers': 'number != 3', 'table_1': 'x != 2'};

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func (a AlterTableAddColumn) FormatSQL(formatter Formatter) {`
`224`	`224`	`formatter.WriteExpr(a.After)`
`225`	`225`	`}`
`226`	`226`	`if a.Settings != nil {`
`227`		`- formatter.WriteByte(whitespace)`
	`227`	`+ formatter.Break()`
`228`	`228`	`formatter.WriteExpr(a.Settings)`
`229`	`229`	`}`
`230`	`230`	`}`
`@@ -310,7 +310,7 @@ func (a AlterTableDetachPartition) FormatSQL(formatter Formatter) {`
`310`	`310`	`formatter.WriteString("DETACH ")`
`311`	`311`	`formatter.WriteExpr(a.Partition)`
`312`	`312`	`if a.Settings != nil {`
`313`		`- formatter.WriteByte(whitespace)`
	`313`	`+ formatter.Break()`
`314`	`314`	`formatter.WriteExpr(a.Settings)`
`315`	`315`	`}`
`316`	`316`	`}`
`@@ -338,7 +338,7 @@ func (a AlterTableDropPartition) FormatSQL(formatter Formatter) {`
`338`	`338`	`}`
`339`	`339`	`formatter.WriteExpr(a.Partition)`
`340`	`340`	`if a.Settings != nil {`
`341`		`- formatter.WriteByte(whitespace)`
	`341`	`+ formatter.Break()`
`342`	`342`	`formatter.WriteExpr(a.Settings)`
`343`	`343`	`}`
`344`	`344`	`}`
`@@ -858,7 +858,12 @@ func (c CreateMaterializedView) FormatSQL(formatter Formatter) {`
`858`	`858`	`formatter.WriteExpr(c.Settings)`
`859`	`859`	`}`
`860`	`860`	`if c.HasAppend {`
`861`		`- formatter.WriteString(" APPEND")`
	`861`	`+ if c.Settings != nil {`
	`862`	`+ formatter.Break()`
	`863`	`+ } else {`
	`864`	`+ formatter.WriteByte(whitespace)`
	`865`	`+ }`
	`866`	`+ formatter.WriteString("APPEND")`
`862`	`867`	`}`
`863`	`868`	`if c.Engine != nil {`
`864`	`869`	`formatter.WriteExpr(c.Engine)`
`@@ -2307,13 +2312,18 @@ func (s SettingPair) FormatSQL(formatter Formatter) {`
`2307`	`2312`	`}`
`2308`	`2313`
`2309`	`2314`	`func (s SettingsClause) FormatSQL(formatter Formatter) {`
`2310`		`- formatter.WriteString("SETTINGS ")`
	`2315`	`+ formatter.WriteString("SETTINGS")`
	`2316`	`+ formatter.Indent()`
`2311`	`2317`	`for i, item := range s.Items {`
`2312`		`- if i > 0 {`
`2313`		`- formatter.WriteString(", ")`
	`2318`	`+ if i == 0 {`
	`2319`	`+ formatter.Break()`
	`2320`	`+ } else {`
	`2321`	`+ formatter.WriteByte(',')`
	`2322`	`+ formatter.Break()`
`2314`	`2323`	`}`
`2315`	`2324`	`formatter.WriteExpr(item)`
`2316`	`2325`	`}`
	`2326`	`+ formatter.Dedent()`
`2317`	`2327`	`}`
`2318`	`2328`
`2319`	`2329`	`func (s ShowStmt) FormatSQL(formatter Formatter) {`