From ca9be96e486cd57615d5525f08190dc7ce3c1b88 Mon Sep 17 00:00:00 2001 From: SoMuchForSubtlety Date: Tue, 11 Jul 2023 11:38:41 +0200 Subject: [PATCH] Fix code geneation for sqlc.slice Fixes #2430 --- .../golang/templates/stdlib/queryCode.tmpl | 4 + .../sqlc_slice_prepared/sqlite/go/db.go | 88 +++++++++++++++++++ .../sqlc_slice_prepared/sqlite/go/models.go | 15 ++++ .../sqlite/go/query.sql.go | 56 ++++++++++++ .../sqlc_slice_prepared/sqlite/query.sql | 6 ++ .../sqlc_slice_prepared/sqlite/sqlc.json | 13 +++ 6 files changed, 182 insertions(+) create mode 100644 internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/sqlc_slice_prepared/sqlite/query.sql create mode 100644 internal/endtoend/testdata/sqlc_slice_prepared/sqlite/sqlc.json diff --git a/internal/codegen/golang/templates/stdlib/queryCode.tmpl b/internal/codegen/golang/templates/stdlib/queryCode.tmpl index f9b5899286..6eca49cd17 100644 --- a/internal/codegen/golang/templates/stdlib/queryCode.tmpl +++ b/internal/codegen/golang/templates/stdlib/queryCode.tmpl @@ -142,7 +142,11 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}} query = strings.Replace(query, "/*SLICE:{{.Arg.Column.Name}}*/?", "NULL", 1) } {{- end }} + {{- if emitPreparedQueries }} + {{ queryRetval . }} {{ queryMethod . }}(ctx, nil, query, queryParams...) + {{- else}} {{ queryRetval . }} {{ queryMethod . }}(ctx, query, queryParams...) + {{- end -}} {{- else if emitPreparedQueries }} {{- queryRetval . }} {{ queryMethod . }}(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}}) {{- else}} diff --git a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/db.go b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/db.go new file mode 100644 index 0000000000..abb75859c5 --- /dev/null +++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/db.go @@ -0,0 +1,88 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 + +package querytest + +import ( + "context" + "database/sql" + "fmt" +) + +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} +} + +func Prepare(ctx context.Context, db DBTX) (*Queries, error) { + q := Queries{db: db} + var err error + if q.funcParamIdentStmt, err = db.PrepareContext(ctx, funcParamIdent); err != nil { + return nil, fmt.Errorf("error preparing query FuncParamIdent: %w", err) + } + return &q, nil +} + +func (q *Queries) Close() error { + var err error + if q.funcParamIdentStmt != nil { + if cerr := q.funcParamIdentStmt.Close(); cerr != nil { + err = fmt.Errorf("error closing funcParamIdentStmt: %w", cerr) + } + } + return err +} + +func (q *Queries) exec(ctx context.Context, stmt *sql.Stmt, query string, args ...interface{}) (sql.Result, error) { + switch { + case stmt != nil && q.tx != nil: + return q.tx.StmtContext(ctx, stmt).ExecContext(ctx, args...) + case stmt != nil: + return stmt.ExecContext(ctx, args...) + default: + return q.db.ExecContext(ctx, query, args...) + } +} + +func (q *Queries) query(ctx context.Context, stmt *sql.Stmt, query string, args ...interface{}) (*sql.Rows, error) { + switch { + case stmt != nil && q.tx != nil: + return q.tx.StmtContext(ctx, stmt).QueryContext(ctx, args...) + case stmt != nil: + return stmt.QueryContext(ctx, args...) + default: + return q.db.QueryContext(ctx, query, args...) + } +} + +func (q *Queries) queryRow(ctx context.Context, stmt *sql.Stmt, query string, args ...interface{}) *sql.Row { + switch { + case stmt != nil && q.tx != nil: + return q.tx.StmtContext(ctx, stmt).QueryRowContext(ctx, args...) + case stmt != nil: + return stmt.QueryRowContext(ctx, args...) + default: + return q.db.QueryRowContext(ctx, query, args...) + } +} + +type Queries struct { + db DBTX + tx *sql.Tx + funcParamIdentStmt *sql.Stmt +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + tx: tx, + funcParamIdentStmt: q.funcParamIdentStmt, + } +} diff --git a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/models.go b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/models.go new file mode 100644 index 0000000000..1aa7431b0e --- /dev/null +++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/models.go @@ -0,0 +1,15 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + ID int64 + Name string + Bar sql.NullString +} diff --git a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go new file mode 100644 index 0000000000..81774de9c0 --- /dev/null +++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 +// source: query.sql + +package querytest + +import ( + "context" + "strings" +) + +const funcParamIdent = `-- name: FuncParamIdent :many +SELECT name FROM foo +WHERE name = ?1 + AND id IN (/*SLICE:favourites*/?) +` + +type FuncParamIdentParams struct { + Slug string + Favourites []int64 +} + +func (q *Queries) FuncParamIdent(ctx context.Context, arg FuncParamIdentParams) ([]string, error) { + query := funcParamIdent + var queryParams []interface{} + queryParams = append(queryParams, arg.Slug) + if len(arg.Favourites) > 0 { + for _, v := range arg.Favourites { + queryParams = append(queryParams, v) + } + query = strings.Replace(query, "/*SLICE:favourites*/?", strings.Repeat(",?", len(arg.Favourites))[1:], 1) + } else { + query = strings.Replace(query, "/*SLICE:favourites*/?", "NULL", 1) + } + rows, err := q.query(ctx, nil, query, queryParams...) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var name string + if err := rows.Scan(&name); err != nil { + return nil, err + } + items = append(items, name) + } + 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/sqlc_slice_prepared/sqlite/query.sql b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/query.sql new file mode 100644 index 0000000000..fd2440c3a7 --- /dev/null +++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/query.sql @@ -0,0 +1,6 @@ +CREATE TABLE foo (id int not null, name text not null, bar text); + +/* name: FuncParamIdent :many */ +SELECT name FROM foo +WHERE name = sqlc.arg(slug) + AND id IN (sqlc.slice(favourites)); diff --git a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/sqlc.json b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/sqlc.json new file mode 100644 index 0000000000..4c29b7e7ab --- /dev/null +++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "engine": "sqlite", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql", + "emit_prepared_queries": true + } + ] +} \ No newline at end of file