Improve the CREATE DIRECTORY format

Author: git-hulk

parser/format.go

@@ -756,17 +756,17 @@ func (c *CreateDictionary) FormatSQL(formatter *Formatter) {
 	formatter.WriteExpr(c.Name)
 
 	if c.UUID != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(c.UUID)
 	}
 
 	if c.OnCluster != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(c.OnCluster)
 	}
 
 	if c.Schema != nil {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteExpr(c.Schema)
 	}
 
@@ -1183,35 +1183,32 @@ func (d *DictionaryAttribute) FormatSQL(formatter *Formatter) {
 }
 
 func (d *DictionaryEngineClause) FormatSQL(formatter *Formatter) {
+	needsBreak := false
+	breakAndWrite := func(expr Expr) {
+		if needsBreak {
+			formatter.Break()
+		}
+		formatter.WriteExpr(expr)
+		needsBreak = true
+	}
+
 	if d.PrimaryKey != nil {
-		formatter.WriteExpr(d.PrimaryKey)
+		breakAndWrite(d.PrimaryKey)
 	}
 	if d.Source != nil {
-		if d.PrimaryKey != nil {
-			formatter.Break()
-		}
-		formatter.WriteExpr(d.Source)
+		breakAndWrite(d.Source)
 	}
 	if d.Lifetime != nil {
-		if d.PrimaryKey != nil || d.Source != nil {
-			formatter.Break()
-		}
-		formatter.WriteExpr(d.Lifetime)
+		breakAndWrite(d.Lifetime)
 	}
 	if d.Layout != nil {
-		if d.PrimaryKey != nil || d.Source != nil || d.Lifetime != nil {
-			formatter.Break()
-		}
-		formatter.WriteExpr(d.Layout)
+		breakAndWrite(d.Layout)
 	}
 	if d.Range != nil {
-		if d.PrimaryKey != nil || d.Source != nil || d.Lifetime != nil || d.Layout != nil {
-			formatter.Break()
-		}
-		formatter.WriteExpr(d.Range)
+		breakAndWrite(d.Range)
 	}
 	if d.Settings != nil {
-		if d.PrimaryKey != nil || d.Source != nil || d.Lifetime != nil || d.Layout != nil || d.Range != nil {
+		if needsBreak {
 			formatter.Break()
 		}
 		formatter.WriteString("SETTINGS(")

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

@@ -21,7 +21,8 @@ LAYOUT(HASHED())
 SETTINGS(max_block_size = 8192);
 
 -- Beautify SQL:
-CREATE DICTIONARY test.my_dict (
+CREATE DICTIONARY test.my_dict
+(
   id UInt64,
   name String DEFAULT '',
   value Float64 EXPRESSION toFloat64OrZero(name),

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

@@ -24,7 +24,10 @@ LAYOUT(HASHED())
 SETTINGS(max_block_size = 8192, max_insert_block_size = 1048576);
 
 -- Beautify SQL:
-CREATE OR REPLACE DICTIONARY test.comprehensive_dict UUID '12345678-1234-1234-1234-123456789012' ON CLUSTER production_cluster (
+CREATE OR REPLACE DICTIONARY test.comprehensive_dict
+UUID '12345678-1234-1234-1234-123456789012'
+ON CLUSTER production_cluster
+(
   id UInt64,
   name String DEFAULT '',
   value Float64 EXPRESSION toFloat64OrZero(name),

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

@@ -23,7 +23,8 @@ COMMENT 'This is a test dictionary with comment';
 
 
 -- Beautify SQL:
-CREATE DICTIONARY test.my_dict (
+CREATE DICTIONARY test.my_dict
+(
   id UInt64,
   name String DEFAULT '',
   value Float64 EXPRESSION toFloat64OrZero(name),