From feab13e4e8cda016ebdd49a2a67b900ac055c977 Mon Sep 17 00:00:00 2001 From: Giuliano Macedo Date: Tue, 25 Feb 2025 10:30:48 -0300 Subject: [PATCH 1/3] fix(sqlite): removed ToLower in typecast --- internal/engine/sqlite/convert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index 29c06fb285..158f4d4348 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -1079,7 +1079,7 @@ func (c *cc) convertCastExpr(n *parser.Expr_castContext) ast.Node { TypeName: &ast.TypeName{ Name: name, Names: &ast.List{Items: []ast.Node{ - NewIdentifier(name), + &ast.String{Str: name}, }}, ArrayBounds: &ast.List{}, }, From 66cf32b2d8b458174f214348b1b346142314e3e0 Mon Sep 17 00:00:00 2001 From: Giuliano Macedo Date: Tue, 25 Feb 2025 10:31:51 -0300 Subject: [PATCH 2/3] refact(sqlite): more expecific variable name --- internal/engine/sqlite/convert.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index 158f4d4348..6df0bca4d8 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -1073,13 +1073,13 @@ 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() + typeName := n.Type_name().GetText() return &ast.TypeCast{ Arg: c.convert(n.Expr()), TypeName: &ast.TypeName{ - Name: name, + Name: typeName, Names: &ast.List{Items: []ast.Node{ - &ast.String{Str: name}, + &ast.String{Str: typeName}, }}, ArrayBounds: &ast.List{}, }, From 9dd4b9dfc45c4abe51dbc7cc5863128adfb2ec00 Mon Sep 17 00:00:00 2001 From: Giuliano Macedo Date: Tue, 25 Feb 2025 10:32:29 -0300 Subject: [PATCH 3/3] tests(sqlite): cast param with override --- .../cast_param_with_override/sqlite/go/db.go | 31 +++++++++++++ .../sqlite/go/models.go | 14 ++++++ .../sqlite/go/query.sql.go | 44 +++++++++++++++++++ .../cast_param_with_override/sqlite/query.sql | 2 + .../sqlite/schema.sql | 4 ++ .../cast_param_with_override/sqlite/sqlc.json | 18 ++++++++ 6 files changed, 113 insertions(+) create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/query.sql create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/schema.sql create mode 100644 internal/endtoend/testdata/cast_param_with_override/sqlite/sqlc.json diff --git a/internal/endtoend/testdata/cast_param_with_override/sqlite/go/db.go b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/db.go new file mode 100644 index 0000000000..cbb2bcd8ef --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.28.0 + +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_with_override/sqlite/go/models.go b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/models.go new file mode 100644 index 0000000000..c2981e587a --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.28.0 + +package querytest + +import ( + "github.com/sqlc-dev/sqlc-testdata/pkg" +) + +type Foo struct { + Bar pkg.CustomType + Baz int64 +} diff --git a/internal/endtoend/testdata/cast_param_with_override/sqlite/go/query.sql.go b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/query.sql.go new file mode 100644 index 0000000000..88a475f06d --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/go/query.sql.go @@ -0,0 +1,44 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.28.0 +// source: query.sql + +package querytest + +import ( + "context" + + "github.com/sqlc-dev/sqlc-testdata/pkg" +) + +const getData = `-- name: GetData :many +SELECT baz, CAST(max(bar) AS REAL) AS result FROM foo +` + +type GetDataRow struct { + Baz int64 + Result pkg.CustomType +} + +func (q *Queries) GetData(ctx context.Context) ([]GetDataRow, error) { + rows, err := q.db.QueryContext(ctx, getData) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetDataRow + for rows.Next() { + var i GetDataRow + if err := rows.Scan(&i.Baz, &i.Result); 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_with_override/sqlite/query.sql b/internal/endtoend/testdata/cast_param_with_override/sqlite/query.sql new file mode 100644 index 0000000000..2f1318eaab --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/query.sql @@ -0,0 +1,2 @@ +-- name: GetData :many +SELECT baz, CAST(max(bar) AS REAL) AS result FROM foo; diff --git a/internal/endtoend/testdata/cast_param_with_override/sqlite/schema.sql b/internal/endtoend/testdata/cast_param_with_override/sqlite/schema.sql new file mode 100644 index 0000000000..fefb7fe99b --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/schema.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo ( + bar REAL NOT NULL, + baz INTEGER NOT NULL +); diff --git a/internal/endtoend/testdata/cast_param_with_override/sqlite/sqlc.json b/internal/endtoend/testdata/cast_param_with_override/sqlite/sqlc.json new file mode 100644 index 0000000000..82c7365cd9 --- /dev/null +++ b/internal/endtoend/testdata/cast_param_with_override/sqlite/sqlc.json @@ -0,0 +1,18 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "schema": "schema.sql", + "queries": "query.sql", + "name": "querytest", + "overrides": [ + { + "db_type": "REAL", + "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType" + } + ] + } + ] +}