change OrderBy to a slice for the sqlparser package

Signed-off-by: Andres Taylor <andres@planetscale.com>
planetscale · Feb 5, 2025 · 7315bbc · 7315bbc
1 parent 874f74a
commit 7315bbc
Show file tree

Hide file tree

Showing 13 changed files with 256 additions and 127 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -57,8 +57,8 @@ type (
 	OrderAndLimit interface {
 		AddOrder(*Order)
 		SetLimit(*Limit)
-		GetOrderBy() OrderBy
-		SetOrderBy(OrderBy)
+		GetOrderBy() []*Order
+		SetOrderBy([]*Order)
 		GetLimit() *Limit
 	}
 
@@ -300,7 +300,7 @@ type (
 		GroupBy     *GroupBy
 		Having      *Where
 		Windows     NamedWindows
-		OrderBy     OrderBy
+		OrderBy     []*Order
 		Limit       *Limit
 		Lock        Lock
 		Into        *SelectInto
@@ -329,7 +329,7 @@ type (
 		Left     TableStatement
 		Right    TableStatement
 		Distinct bool
-		OrderBy  OrderBy
+		OrderBy  []*Order
 		Limit    *Limit
 		Lock     Lock
 		Into     *SelectInto
@@ -388,7 +388,7 @@ type (
 		TableExprs []TableExpr
 		Exprs      UpdateExprs
 		Where      *Where
-		OrderBy    OrderBy
+		OrderBy    []*Order
 		Limit      *Limit
 	}
 
@@ -402,7 +402,7 @@ type (
 		Targets    TableNames
 		Partitions Partitions
 		Where      *Where
-		OrderBy    OrderBy
+		OrderBy    []*Order
 		Limit      *Limit
 	}
 
@@ -2211,7 +2211,7 @@ type (
 	WindowSpecification struct {
 		Name            IdentifierCI
 		PartitionClause []Expr
-		OrderClause     OrderBy
+		OrderBy         []*Order
 		FrameClause     *FrameClause
 	}
 
@@ -3063,7 +3063,7 @@ type (
 	GroupConcatExpr struct {
 		Distinct  bool
 		Exprs     []Expr
-		OrderBy   OrderBy
+		OrderBy   []*Order
 		Separator string
 		Limit     *Limit
 	}
@@ -3617,7 +3617,7 @@ type ValuesStatement struct {
 	ListArg ListArg
 
 	Comments *ParsedComments
-	Order    OrderBy
+	OrderBy  []*Order
 	Limit    *Limit
 }
 

diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
diff --git a/go/vt/sqlparser/ast_copy_on_rewrite.go b/go/vt/sqlparser/ast_copy_on_rewrite.go