From 7b3490b80a9f34b67905dde303a6067918232f9a Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Mon, 17 Jul 2023 06:28:34 +0900 Subject: [PATCH 1/2] fix(engine/sqlite): added function to convert cast node fix #2424 --- internal/engine/sqlite/convert.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index a730fabdb6..c9e956c95e 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -887,6 +887,21 @@ func (c *cc) convertBetweenExpr(n *parser.Expr_betweenContext) ast.Node { } } +func (c *cc) convertCastExpr(n *parser.Expr_castContext) ast.Node { + name := n.Type_name().GetText() + return &ast.TypeCast{ + Arg: c.convert(n.Expr()), + TypeName: &ast.TypeName{ + Name: name, + Names: &ast.List{Items: []ast.Node{ + NewIdentifer(name), + }}, + ArrayBounds: &ast.List{}, + }, + Location: n.GetStart().GetStart(), + } +} + func (c *cc) convert(node node) ast.Node { switch n := node.(type) { @@ -966,6 +981,9 @@ func (c *cc) convert(node node) ast.Node { case *parser.Update_stmt_limitedContext: return c.convertUpdate_stmtContext(n) + case *parser.Expr_castContext: + return c.convertCastExpr(n) + default: return todo("convert(case=default)", n) } From 8767324a7dbc907b31aaef1d3dd944ebb82226cc Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Mon, 17 Jul 2023 06:30:17 +0900 Subject: [PATCH 2/2] test: add endtoend --- .../testdata/cast_param/sqlite/go/db.go | 31 +++++++++++++++ .../testdata/cast_param/sqlite/go/models.go | 14 +++++++ .../cast_param/sqlite/go/query.sql.go | 39 +++++++++++++++++++ .../testdata/cast_param/sqlite/query.sql | 10 +++++ .../testdata/cast_param/sqlite/sqlc.json | 12 ++++++ 5 files changed, 106 insertions(+) create mode 100644 internal/endtoend/testdata/cast_param/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/cast_param/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/cast_param/sqlite/query.sql create mode 100644 internal/endtoend/testdata/cast_param/sqlite/sqlc.json diff --git a/internal/endtoend/testdata/cast_param/sqlite/go/db.go b/internal/endtoend/testdata/cast_param/sqlite/go/db.go new file mode 100644 index 0000000000..fb6ae669f6 --- /dev/null +++ b/internal/endtoend/testdata/cast_param/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.1 + +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/cast_param/sqlite/go/models.go b/internal/endtoend/testdata/cast_param/sqlite/go/models.go new file mode 100644 index 0000000000..f2d8174671 --- /dev/null +++ b/internal/endtoend/testdata/cast_param/sqlite/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.1 + +package querytest + +import ( + "database/sql" +) + +type MyTable struct { + Invalid sql.NullBool + Foo sql.NullString +} diff --git a/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go b/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go new file mode 100644 index 0000000000..8c9cc1a5aa --- /dev/null +++ b/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go @@ -0,0 +1,39 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.1 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getData = `-- name: GetData :many +select invalid, foo +from my_table +where (cast(?1 as boolean) or not invalid) +` + +func (q *Queries) GetData(ctx context.Context, allowInvalid bool) ([]MyTable, error) { + rows, err := q.db.QueryContext(ctx, getData, allowInvalid) + if err != nil { + return nil, err + } + defer rows.Close() + var items []MyTable + for rows.Next() { + var i MyTable + if err := rows.Scan(&i.Invalid, &i.Foo); 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/cast_param/sqlite/query.sql b/internal/endtoend/testdata/cast_param/sqlite/query.sql new file mode 100644 index 0000000000..0353d74c84 --- /dev/null +++ b/internal/endtoend/testdata/cast_param/sqlite/query.sql @@ -0,0 +1,10 @@ +create table my_table +( + invalid boolean, + foo varchar +); + +-- name: GetData :many +select * +from my_table +where (cast(sqlc.arg(allow_invalid) as boolean) or not invalid); \ No newline at end of file diff --git a/internal/endtoend/testdata/cast_param/sqlite/sqlc.json b/internal/endtoend/testdata/cast_param/sqlite/sqlc.json new file mode 100644 index 0000000000..3ed5eea856 --- /dev/null +++ b/internal/endtoend/testdata/cast_param/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "schema": "query.sql", + "queries": "query.sql", + "name": "querytest" + } + ] +} \ No newline at end of file