cleanup

Author: khepin

internal/endtoend/testdata/order_by_binds/sqlite/go/query.sql.go

@@ -22,3 +22,11 @@ ORDER   BY id % ?;
 SELECT  * FROM authors
 WHERE   id > sqlc.arg(min_id)
 ORDER   BY name ASC;
+
+-- name: ListAuthorsNamedParamsOnly :many
+SELECT * FROM authors
+ORDER BY
+    CASE
+        WHEN @sort = 'name' THEN name
+        WHEN @sort = 'bio' THEN bio
+    END ASC;

internal/endtoend/testdata/order_by_binds/sqlite/query.sql

@@ -512,7 +512,7 @@ func (c *cc) convertMultiSelect_stmtContext(n *parser.Select_stmtContext) ast.No
 	}
 
 	limitCount, limitOffset := c.convertLimit_stmtContext(n.Limit_stmt())
-	sortClause := c.buildSortClause(n.Order_by_stmt())
+	sortClause := c.convertOrderby_stmtContext(n.Order_by_stmt())
 
 	selectStmt.LimitCount = limitCount
 	selectStmt.LimitOffset = limitOffset
@@ -624,22 +624,57 @@ func (c *cc) convertWildCardField(n *parser.Result_columnContext) *ast.ColumnRef
 	}
 }
 
-func (c *cc) convertOrderby_stmtContext(n parser.IOrder_by_stmtContext) ast.Node {
-	if orderBy, ok := n.(*parser.Order_by_stmtContext); ok {
-		list := &ast.List{Items: []ast.Node{}}
-		for _, o := range orderBy.AllOrdering_term() {
-			term, ok := o.(*parser.Ordering_termContext)
-			if !ok {
-				continue
+func (c *cc) convertOrderby_stmtContext(n parser.IOrder_by_stmtContext) *ast.List {
+	if n == nil {
+		return nil
+	}
+
+	orderBy, ok := n.(*parser.Order_by_stmtContext)
+	if !ok {
+		if debug.Active {
+			log.Printf("sqlite.convertOrderby_stmtContext: unexpected type %T", n)
+		}
+		return nil
+	}
+
+	if len(orderBy.AllOrdering_term()) == 0 {
+		return nil
+	}
+
+	sortItems := &ast.List{Items: []ast.Node{}}
+	for _, o := range orderBy.AllOrdering_term() {
+		term, ok := o.(*parser.Ordering_termContext)
+		if !ok {
+			continue
+		}
+
+		sortByDir := ast.SortByDirDefault
+		if adNode := term.Asc_desc(); adNode != nil {
+			if adNode.ASC_() != nil {
+				sortByDir = ast.SortByDirAsc
+			} else if adNode.DESC_() != nil {
+				sortByDir = ast.SortByDirDesc
 			}
-			list.Items = append(list.Items, &ast.CaseExpr{
-				Xpr:      c.convert(term.Expr()),
-				Location: term.Expr().GetStart().GetStart(),
-			})
 		}
-		return list
+
+		sortByNulls := ast.SortByNullsDefault
+		if term.NULLS_() != nil {
+			if term.FIRST_() != nil {
+				sortByNulls = ast.SortByNullsFirst
+			} else if term.LAST_() != nil {
+				sortByNulls = ast.SortByNullsLast
+			}
+		}
+
+		sortItems.Items = append(sortItems.Items, &ast.SortBy{
+			Node:        c.convert(term.Expr()),
+			SortbyDir:   sortByDir,
+			SortbyNulls: sortByNulls,
+			UseOp:       &ast.List{},
+			Location:    term.GetStart().GetStart(),
+		})
 	}
-	return todo("convertOrderby_stmtContext", n)
+	return sortItems
 }
 
 func (c *cc) convertLimit_stmtContext(n parser.ILimit_stmtContext) (ast.Node, ast.Node) {
@@ -1316,9 +1351,6 @@ func (c *cc) convert(node node) ast.Node {
 	case *parser.Insert_stmtContext:
 		return c.convertInsert_stmtContext(n)
 
-	case *parser.Order_by_stmtContext:
-		return c.convertOrderby_stmtContext(n)
-
 	case *parser.Select_stmtContext:
 		return c.convertMultiSelect_stmtContext(n)
 
@@ -1342,60 +1374,3 @@ func (c *cc) convert(node node) ast.Node {
 	}
 }
 
-// buildSortClause converts an IOrder_by_stmtContext into an *ast.List of *ast.SortBy nodes.
-func (c *cc) buildSortClause(orderByNode parser.IOrder_by_stmtContext) *ast.List {
-	if orderByNode == nil {
-		return nil
-	}
-
-	orderByCtx, ok := orderByNode.(*parser.Order_by_stmtContext)
-	if !ok {
-		if debug.Active {
-			log.Printf("sqlite.buildSortClause: unexpected type %T for IOrder_by_stmtContext", orderByNode)
-		}
-		return nil
-	}
-
-	if len(orderByCtx.AllOrdering_term()) == 0 {
-		return nil
-	}
-
-	sortItems := &ast.List{Items: []ast.Node{}}
-	for _, otermIP := range orderByCtx.AllOrdering_term() {
-		oterm, ok := otermIP.(*parser.Ordering_termContext)
-		if !ok {
-			if debug.Active {
-				log.Printf("sqlite.buildSortClause: unexpected type %T for IOrdering_termContext", otermIP)
-			}
-			continue
-		}
-
-		sortByDir := ast.SortByDirDefault
-		if adNode := oterm.Asc_desc(); adNode != nil {
-			// Asc_descContext has ASC_() and DESC_() methods which return TerminalNode
-			if adNode.ASC_() != nil {
-				sortByDir = ast.SortByDirAsc
-			} else if adNode.DESC_() != nil {
-				sortByDir = ast.SortByDirDesc
-			}
-		}
-
-		sortByNulls := ast.SortByNullsDefault
-		if oterm.NULLS_() != nil { // NULLS_() is a TerminalNode
-			if oterm.FIRST_() != nil { // FIRST_() is a TerminalNode
-				sortByNulls = ast.SortByNullsFirst
-			} else if oterm.LAST_() != nil { // LAST_() is a TerminalNode
-				sortByNulls = ast.SortByNullsLast
-			}
-		}
-
-		sortItems.Items = append(sortItems.Items, &ast.SortBy{
-			Node:        c.convert(oterm.Expr()),
-			SortbyDir:   sortByDir,
-			SortbyNulls: sortByNulls,
-			UseOp:       &ast.List{}, // Typically empty for standard SQLite ORDER BY
-			Location:    oterm.GetStart().GetStart(),
-		})
-	}
-	return sortItems
-}