fix variables not resolving in ORDER BY statements

sqlc-dev · Jan 9, 2024 · 4fb8011 · 4fb8011
1 parent c9d826b
commit 4fb8011
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 12 deletions.
diff --git a/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/order_by_binds/mysql/query.sql b/internal/endtoend/testdata/order_by_binds/mysql/query.sql
@@ -3,6 +3,10 @@ SELECT * FROM authors
 WHERE id > sqlc.arg(min_id) 
 ORDER BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END;
 
+-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT * FROM authors
+ORDER BY MOD(id, sqlc.arg(mod_arg));
+
 -- name: ListAuthorsNameSort :many
 SELECT * FROM authors
 WHERE id > sqlc.arg(min_id)

diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/query.sql b/internal/endtoend/testdata/order_by_binds/postgresql/query.sql
@@ -3,6 +3,10 @@ SELECT * FROM authors
 WHERE id > sqlc.arg(min_id) 
 ORDER BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END;
 
+-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT * FROM authors
+ORDER BY MOD(id, $1);
+
 -- name: ListAuthorsNameSort :many
 SELECT * FROM authors
 WHERE id > sqlc.arg(min_id)

diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
@@ -1025,18 +1025,7 @@ func (c *cc) convertOrderByClause(n *pcast.OrderByClause) ast.Node {
  }
  list := &ast.List{Items: []ast.Node{}}
  for _, item := range n.Items {
- switch item.Expr.(type) {
- case *pcast.CaseExpr:
- list.Items = append(list.Items, &ast.CaseWhen{
- Expr: c.convert(item.Expr),
- Location: item.Expr.OriginTextPosition(),
- })
- case *pcast.ColumnNameExpr:
- list.Items = append(list.Items, &ast.CaseExpr{
- Xpr: c.convert(item.Expr),
- Location: item.Expr.OriginTextPosition(),
- })
- }
+ list.Items = append(list.Items, c.convert(item.Expr))
  }
  return list
 }