Add ident format for JOIN

Author: git-hulk

parser/format.go

@@ -1770,15 +1770,18 @@ func writeJoinSQL(formatter *Formatter, expr Expr) {
 
 	if len(joinExpr.Modifiers) == 0 {
 		formatter.WriteByte(',')
+		formatter.WriteExpr(joinExpr.Left)
 	} else {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteString(strings.Join(joinExpr.Modifiers, " "))
-		formatter.WriteByte(whitespace)
-	}
-	formatter.WriteExpr(joinExpr.Left)
-	if joinExpr.Constraints != nil {
-		formatter.WriteByte(whitespace)
-		formatter.WriteExpr(joinExpr.Constraints)
+		formatter.Indent()
+		formatter.Break()
+		formatter.WriteExpr(joinExpr.Left)
+		if joinExpr.Constraints != nil {
+			formatter.WriteByte(whitespace)
+			formatter.WriteExpr(joinExpr.Constraints)
+		}
+		formatter.Dedent()
 	}
 	if joinExpr.Right != nil {
 		writeJoinSQL(formatter, joinExpr.Right)

parser/testdata/query/format/beautify/select_table_alias_without_keyword.sql

@@ -4,4 +4,6 @@ SELECT t1.Timestamp FROM my_table t1 INNER JOIN my_other_table t2 ON t1.a=t2.b
 -- Beautify SQL:
 SELECT
   t1.Timestamp
-FROM my_table AS t1 INNER JOIN my_other_table AS t2 ON t1.a = t2.b;
+FROM my_table AS t1
+INNER JOIN
+  my_other_table AS t2 ON t1.a = t2.b;

parser/testdata/query/format/beautify/select_with_join_only.sql

@@ -5,4 +5,6 @@ SELECT * FROM "t1" JOIN "t2" ON true
 -- Beautify SQL:
 SELECT
   *
-FROM "t1" JOIN "t2" ON true;
+FROM "t1"
+JOIN
+  "t2" ON true;

parser/testdata/query/format/beautify/select_with_left_join.sql

@@ -20,4 +20,6 @@ WITH
     2 AS value)
 SELECT
   *
-FROM t1 LEFT JOIN t2 ON true;
+FROM t1
+LEFT JOIN
+  t2 ON true;

parser/testdata/query/format/beautify/select_with_multi_array_and_inner_join.sql

@@ -11,6 +11,14 @@ WHERE value != '';
 -- Beautify SQL:
 SELECT
   JSONExtractString(t3.props, 'value') AS value
-FROM t1 ARRAY JOIN JSONExtractArrayRaw(t1.props, 'arr1') AS a1 INNER JOIN t2 ON t2.id = JSONExtractString(a1, 'id') ARRAY JOIN JSONExtractArrayRaw(t2.props, 'arr2') AS a2 INNER JOIN t3 ON t3.id = JSONExtractString(a2, 'id')
+FROM t1
+ARRAY JOIN
+  JSONExtractArrayRaw(t1.props, 'arr1') AS a1
+INNER JOIN
+  t2 ON t2.id = JSONExtractString(a1, 'id')
+ARRAY JOIN
+  JSONExtractArrayRaw(t2.props, 'arr2') AS a2
+INNER JOIN
+  t3 ON t3.id = JSONExtractString(a2, 'id')
 WHERE
   value != '';

parser/testdata/query/format/beautify/select_with_multi_array_join.sql

@@ -13,4 +13,8 @@ FROM t1
 SELECT
   v,
   j
-FROM t1 ARRAY JOIN JSONExtractArrayRaw(a) AS j ARRAY JOIN array(JSONExtractString(j, 'x'), JSONExtractString(j, 'y')) AS v;
+FROM t1
+ARRAY JOIN
+  JSONExtractArrayRaw(a) AS j
+ARRAY JOIN
+  array(JSONExtractString(j, 'x'), JSONExtractString(j, 'y')) AS v;

parser/testdata/query/format/beautify/select_with_multi_join.sql

@@ -30,4 +30,12 @@ SELECT
   t1.value AS value1,
   t2.value AS value2,
   t3.value AS value3
-FROM t1 JOIN t2 ON true JOIN t3 JOIN t4 ON true JOIN t5;
+FROM t1
+JOIN
+  t2 ON true
+JOIN
+  t3
+JOIN
+  t4 ON true
+JOIN
+  t5;

parser/testdata/query/format/beautify/select_with_number_field.sql

@@ -6,4 +6,6 @@ SELECT
   foo,
   bar.1,
   foo.2
-FROM foo ARRAY JOIN m AS bar;
+FROM foo
+ARRAY JOIN
+  m AS bar;

parser/testdata/query/format/beautify/select_with_settings_additional_table_filters.sql

@@ -39,8 +39,10 @@ SELECT
 FROM (SELECT
   number
 FROM system.numbers
-LIMIT 5) AS f ANY LEFT JOIN (SELECT
-  x,
-  y
-FROM table_1) AS s ON f.number = s.x
+LIMIT 5) AS f
+ANY LEFT JOIN
+  (SELECT
+    x,
+    y
+  FROM table_1) AS s ON f.number = s.x
 SETTINGS additional_table_filters={'system.numbers': 'number != 3', 'table_1': 'x != 2'};