From af6eb82b35dadbff055ee57b3a4b6aa4a9381920 Mon Sep 17 00:00:00 2001 From: Timothy Studd Date: Sat, 6 Nov 2021 08:40:46 -0700 Subject: [PATCH] fix(engine/mysql): Fix missing binds in ORDER BY --- .../testdata/order_by_binds/mysql/go/db.go | 29 ++++++++ .../order_by_binds/mysql/go/models.go | 13 ++++ .../order_by_binds/mysql/go/query.sql.go | 71 +++++++++++++++++++ .../testdata/order_by_binds/mysql/query.sql | 15 ++++ .../testdata/order_by_binds/mysql/sqlc.json | 12 ++++ .../order_by_binds/postgresql/go/db.go | 29 ++++++++ .../order_by_binds/postgresql/go/models.go | 13 ++++ .../order_by_binds/postgresql/go/query.sql.go | 71 +++++++++++++++++++ .../order_by_binds/postgresql/query.sql | 15 ++++ .../order_by_binds/postgresql/sqlc.json | 12 ++++ internal/engine/dolphin/convert.go | 61 +++++++++++++--- 11 files changed, 332 insertions(+), 9 deletions(-) create mode 100644 internal/endtoend/testdata/order_by_binds/mysql/go/db.go create mode 100644 internal/endtoend/testdata/order_by_binds/mysql/go/models.go create mode 100644 internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go create mode 100644 internal/endtoend/testdata/order_by_binds/mysql/query.sql create mode 100644 internal/endtoend/testdata/order_by_binds/mysql/sqlc.json create mode 100644 internal/endtoend/testdata/order_by_binds/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/order_by_binds/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/order_by_binds/postgresql/query.sql create mode 100644 internal/endtoend/testdata/order_by_binds/postgresql/sqlc.json diff --git a/internal/endtoend/testdata/order_by_binds/mysql/go/db.go b/internal/endtoend/testdata/order_by_binds/mysql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/mysql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/order_by_binds/mysql/go/models.go b/internal/endtoend/testdata/order_by_binds/mysql/go/models.go new file mode 100644 index 0000000000..f6e099e89b --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/mysql/go/models.go @@ -0,0 +1,13 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int64 + Name string + Bio sql.NullString +} 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 new file mode 100644 index 0000000000..d3162ac626 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go @@ -0,0 +1,71 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const listAuthorsColumnSort = `-- name: ListAuthorsColumnSort :many +SELECT id, name, bio FROM authors +WHERE id > ? +ORDER BY CASE WHEN ? = 'name' THEN name END +` + +type ListAuthorsColumnSortParams struct { + MinID int64 + SortColumn interface{} +} + +func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColumnSortParams) ([]Author, error) { + rows, err := q.db.QueryContext(ctx, listAuthorsColumnSort, arg.MinID, arg.SortColumn) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Author + for rows.Next() { + var i Author + if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listAuthorsNameSort = `-- name: ListAuthorsNameSort :many +SELECT id, name, bio FROM authors +WHERE id > ? +ORDER BY name ASC +` + +func (q *Queries) ListAuthorsNameSort(ctx context.Context, minID int64) ([]Author, error) { + rows, err := q.db.QueryContext(ctx, listAuthorsNameSort, minID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Author + for rows.Next() { + var i Author + if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/order_by_binds/mysql/query.sql b/internal/endtoend/testdata/order_by_binds/mysql/query.sql new file mode 100644 index 0000000000..6dd2664b3d --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/mysql/query.sql @@ -0,0 +1,15 @@ +CREATE TABLE authors ( + id BIGINT PRIMARY KEY, + name text NOT NULL, + bio text +); + +-- name: ListAuthorsColumnSort :many +SELECT * FROM authors +WHERE id > sqlc.arg(min_id) +ORDER BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END; + +-- name: ListAuthorsNameSort :many +SELECT * FROM authors +WHERE id > sqlc.arg(min_id) +ORDER BY name ASC; diff --git a/internal/endtoend/testdata/order_by_binds/mysql/sqlc.json b/internal/endtoend/testdata/order_by_binds/mysql/sqlc.json new file mode 100644 index 0000000000..534b7e24e9 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "mysql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/go/db.go b/internal/endtoend/testdata/order_by_binds/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/go/models.go b/internal/endtoend/testdata/order_by_binds/postgresql/go/models.go new file mode 100644 index 0000000000..f6e099e89b --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/postgresql/go/models.go @@ -0,0 +1,13 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int64 + Name string + Bio sql.NullString +} 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 new file mode 100644 index 0000000000..3e815c4e75 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go @@ -0,0 +1,71 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const listAuthorsColumnSort = `-- name: ListAuthorsColumnSort :many +SELECT id, name, bio FROM authors +WHERE id > $1 +ORDER BY CASE WHEN $2 = 'name' THEN name END +` + +type ListAuthorsColumnSortParams struct { + MinID int64 + SortColumn interface{} +} + +func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColumnSortParams) ([]Author, error) { + rows, err := q.db.QueryContext(ctx, listAuthorsColumnSort, arg.MinID, arg.SortColumn) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Author + for rows.Next() { + var i Author + if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listAuthorsNameSort = `-- name: ListAuthorsNameSort :many +SELECT id, name, bio FROM authors +WHERE id > $1 +ORDER BY name ASC +` + +func (q *Queries) ListAuthorsNameSort(ctx context.Context, minID int64) ([]Author, error) { + rows, err := q.db.QueryContext(ctx, listAuthorsNameSort, minID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Author + for rows.Next() { + var i Author + if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/query.sql b/internal/endtoend/testdata/order_by_binds/postgresql/query.sql new file mode 100644 index 0000000000..82889828c2 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/postgresql/query.sql @@ -0,0 +1,15 @@ +CREATE TABLE authors ( + id BIGSERIAL PRIMARY KEY, + name text NOT NULL, + bio text +); + +-- name: ListAuthorsColumnSort :many +SELECT * FROM authors +WHERE id > sqlc.arg(min_id) +ORDER BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END; + +-- name: ListAuthorsNameSort :many +SELECT * FROM authors +WHERE id > sqlc.arg(min_id) +ORDER BY name ASC; diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/sqlc.json b/internal/endtoend/testdata/order_by_binds/postgresql/sqlc.json new file mode 100644 index 0000000000..af57681f66 --- /dev/null +++ b/internal/endtoend/testdata/order_by_binds/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go index 410e46c4a1..6f8236e1c7 100644 --- a/internal/engine/dolphin/convert.go +++ b/internal/engine/dolphin/convert.go @@ -452,14 +452,21 @@ func (c *cc) convertSelectField(n *pcast.SelectField) *ast.ResTarget { } func (c *cc) convertSelectStmt(n *pcast.SelectStmt) *ast.SelectStmt { + windowClause := &ast.List{Items: make([]ast.Node, 0)} + orderByClause := c.convertOrderByClause(n.OrderBy) + if orderByClause != nil { + windowClause.Items = append(windowClause.Items, orderByClause) + } + op, all := c.convertSetOprType(n.AfterSetOperator) stmt := &ast.SelectStmt{ - TargetList: c.convertFieldList(n.Fields), - FromClause: c.convertTableRefsClause(n.From), - WhereClause: c.convert(n.Where), - WithClause: c.convertWithClause(n.With), - Op: op, - All: all, + TargetList: c.convertFieldList(n.Fields), + FromClause: c.convertTableRefsClause(n.From), + WhereClause: c.convert(n.Where), + WithClause: c.convertWithClause(n.With), + WindowClause: windowClause, + Op: op, + All: all, } if n.Limit != nil { stmt.LimitCount = c.convert(n.Limit.Count) @@ -656,7 +663,18 @@ func (c *cc) convertByItem(n *pcast.ByItem) ast.Node { } func (c *cc) convertCaseExpr(n *pcast.CaseExpr) ast.Node { - return todo(n) + if n == nil { + return nil + } + list := &ast.List{Items: []ast.Node{}} + for _, n := range n.WhenClauses { + list.Items = append(list.Items, c.convertWhenClause(n)) + } + return &ast.CaseExpr{ + Args: list, + Defresult: c.convert(n.ElseClause), + Location: n.OriginTextPosition(), + } } func (c *cc) convertChangeStmt(n *pcast.ChangeStmt) ast.Node { @@ -924,7 +942,25 @@ func (c *cc) convertOnUpdateOpt(n *pcast.OnUpdateOpt) ast.Node { } func (c *cc) convertOrderByClause(n *pcast.OrderByClause) ast.Node { - return todo(n) + if n == nil { + return nil + } + 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(), + }) + } + } + return list } func (c *cc) convertParenthesesExpr(n *pcast.ParenthesesExpr) ast.Node { @@ -1249,7 +1285,14 @@ func (c *cc) convertVariableExpr(n *pcast.VariableExpr) ast.Node { } func (c *cc) convertWhenClause(n *pcast.WhenClause) ast.Node { - return todo(n) + if n == nil { + return nil + } + return &ast.CaseWhen{ + Expr: c.convert(n.Expr), + Result: c.convert(n.Result), + Location: n.OriginTextPosition(), + } } func (c *cc) convertWindowFuncExpr(n *pcast.WindowFuncExpr) ast.Node {