Add ident format for GROUP BY

Author: git-hulk

parser/format.go

@@ -1504,43 +1504,30 @@ func (g *GranteesClause) FormatSQL(formatter *Formatter) {
 
 func (g *GroupByClause) FormatSQL(formatter *Formatter) {
 	formatter.WriteString("GROUP BY")
+
+	formatter.Indent()
+	defer formatter.Dedent()
 	if g.AggregateType != "" {
-		formatter.WriteByte(whitespace)
+		formatter.Break()
 		formatter.WriteString(g.AggregateType)
 	}
 	if g.Expr != nil {
-		if g.AggregateType == "" && formatter.mode == FormatModeBeautify {
-			if columnList, ok := g.Expr.(*ColumnExprList); ok && len(columnList.Items) > 0 {
-				formatter.Indent()
-				for i, item := range columnList.Items {
-					if i == 0 {
-						formatter.Break()
-					} else {
-						formatter.WriteByte(',')
-						formatter.Break()
-					}
-					formatter.WriteExpr(item)
-				}
-				formatter.Dedent()
-			} else {
-				formatter.WriteByte(whitespace)
-				formatter.WriteExpr(g.Expr)
-			}
-		} else if g.AggregateType == "" {
-			formatter.WriteByte(whitespace)
-			formatter.WriteExpr(g.Expr)
-		} else {
-			formatter.WriteExpr(g.Expr)
+		if g.AggregateType == "" {
+			formatter.Break()
 		}
+		formatter.WriteExpr(g.Expr)
 	}
 	if g.WithCube {
-		formatter.WriteString(" WITH CUBE")
+		formatter.Break()
+		formatter.WriteString("WITH CUBE")
 	}
 	if g.WithRollup {
-		formatter.WriteString(" WITH ROLLUP")
+		formatter.Break()
+		formatter.WriteString("WITH ROLLUP")
 	}
 	if g.WithTotals {
-		formatter.WriteString(" WITH TOTALS")
+		formatter.Break()
+		formatter.WriteString("WITH TOTALS")
 	}
 }
 

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

@@ -41,13 +41,8 @@ GROUP BY
   CASE
     WHEN length(EXTRACT(instance, '((\\d+\\.){3}\\d+)')) > 0 THEN instance
     ELSE '空'
-  END,
-  CASE
+  END, CASE
     WHEN length(EXTRACT(client_ip, '((\\d+\\.){3}\\d+)')) > 0 THEN client_ip
     ELSE '空'
-  END,
-  src_type,
-  node_class,
-  port,
-  client_port
+  END, src_type, node_class, port, client_port
 LIMIT 10000;

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

@@ -27,6 +27,5 @@ AND
 AND
   f3 NOT IN ('a', 'b', 'c')
 GROUP BY
-  f0,
-  f1
+  f0, f1
 LIMIT 10 OFFSET 100 BY f0;

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

@@ -6,6 +6,9 @@ SELECT
   a,
   COUNT(b)
 FROM group_by_all
-GROUP BY CUBE(a) WITH CUBE WITH TOTALS
+GROUP BY
+  CUBE(a)
+  WITH CUBE
+  WITH TOTALS
 ORDER BY
   a;

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

@@ -38,8 +38,7 @@ WITH
   WHERE
     year = 2023
   GROUP BY
-    month,
-    department),
+    month, department),
   ranked AS (SELECT
     month,
     department,

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

@@ -27,10 +27,12 @@ SELECT
   distro,
   SUM(quantity) AS qty
 FROM servers
-GROUP BY GROUPING SETS((datacenter, distro), (datacenter), (distro), ());
+GROUP BY
+  GROUPING SETS((datacenter, distro), (datacenter), (distro), ());
 SELECT
   datacenter,
   distro,
   SUM(quantity) AS qty
 FROM servers
-GROUP BY ALL;
+GROUP BY
+  ALL;