Skip to content

Commit f45d4c8

Browse files
committed
add a few types. export DBTX.
This change includes several enhancements: 1. Add the `blob` type 2. Add the `inet` type and import for the `"net"` package as necessary 3. Fixes the "uses" functions so that they work with array columns 4. Export the `DBTX` interface. The unexported type didn't play well with [wire](https://github.com/google/wire) which needs concrete types which requires them to be exported. That said, since this interface is always the same, maybe there should be a type directly exported by sqlc, e.g. `"github.com/kyleconroy/sqlc.DBTX"` instead. 5. Fixes some minor lint issues Signed-off-by: Joshua Rubin <me@jawa.dev>
1 parent 228fd44 commit f45d4c8

13 files changed

Lines changed: 70 additions & 59 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,19 +203,19 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
203203
return items, nil
204204
}
205205

206-
type dbtx interface {
206+
type DBTX interface {
207207
ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
208208
PrepareContext(context.Context, string) (*sql.Stmt, error)
209209
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
210210
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
211211
}
212212

213-
func New(db dbtx) *Queries {
213+
func New(db DBTX) *Queries {
214214
return &Queries{db: db}
215215
}
216216

217217
type Queries struct {
218-
db dbtx
218+
db DBTX
219219
}
220220

221221
func (q *Queries) WithTx(tx *sql.Tx) *Queries {

examples/any.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ type Author struct {
3636
BirthYear int
3737
}
3838

39-
type dbtx interface {
39+
type DBTX interface {
4040
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
4141
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
4242
}
4343

44-
func New(db dbtx) *Queries {
44+
func New(db DBTX) *Queries {
4545
return &Queries{db: db}
4646
}
4747

4848
type Queries struct {
49-
db dbtx
49+
db DBTX
5050
}
5151

5252
const listAuthors = `-- name: ListAuthorsByIDs :many

examples/delete.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ import (
1818
"database/sql"
1919
)
2020

21-
type dbtx interface {
21+
type DBTX interface {
2222
ExecContext(context.Context, string, ...interface{}) error
2323
}
2424

25-
func New(db dbtx) *Queries {
25+
func New(db DBTX) *Queries {
2626
return &Queries{db: db}
2727
}
2828

2929
type Queries struct {
30-
db dbtx
30+
db DBTX
3131
}
3232

3333
const deleteAuthor = `-- name: DeleteAuthor :exec

examples/insert.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ import (
1818
"database/sql"
1919
)
2020

21-
type dbtx interface {
21+
type DBTX interface {
2222
ExecContext(context.Context, string, ...interface{}) error
2323
}
2424

25-
func New(db dbtx) *Queries {
25+
func New(db DBTX) *Queries {
2626
return &Queries{db: db}
2727
}
2828

2929
type Queries struct {
30-
db dbtx
30+
db DBTX
3131
}
3232

3333
const createAuthor = `-- name: CreateAuthor :exec

examples/prepared_query.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ type Record struct {
2525
ID int
2626
}
2727

28-
type dbtx interface {
28+
type DBTX interface {
2929
PrepareContext(context.Context, string) (*sql.Stmt, error)
3030
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
3131
}
3232

33-
func New(db dbtx) *Queries {
33+
func New(db DBTX) *Queries {
3434
return &Queries{db: db}
3535
}
3636

37-
func Prepare(ctx context.Context, db dbtx) (*Queries, error) {
37+
func Prepare(ctx context.Context, db DBTX) (*Queries, error) {
3838
q := Queries{db: db}
3939
var err error
4040
if q.getRecordStmt, err = db.PrepareContext(ctx, getRecord); err != nil {
@@ -55,7 +55,7 @@ func (q *Queries) queryRow(ctx context.Context, stmt *sql.Stmt, query string, ar
5555
}
5656

5757
type Queries struct {
58-
db dbtx
58+
db DBTX
5959
tx *sql.Tx
6060
getRecordStmt *sql.Stmt
6161
}

examples/query_count.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ import (
2323
"database/sql"
2424
)
2525

26-
type dbtx interface {
26+
type DBTX interface {
2727
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
2828
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
2929
}
3030

31-
func New(db dbtx) *Queries {
31+
func New(db DBTX) *Queries {
3232
return &Queries{db: db}
3333
}
3434

3535
type Queries struct {
36-
db dbtx
36+
db DBTX
3737
}
3838

3939
const countAuthors = `-- name: CountAuthors :one

examples/query_one.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ type Author struct {
5353
BirthYear int
5454
}
5555

56-
type dbtx interface {
56+
type DBTX interface {
5757
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
5858
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
5959
}
6060

61-
func New(db dbtx) *Queries {
61+
func New(db DBTX) *Queries {
6262
return &Queries{db: db}
6363
}
6464

6565
type Queries struct {
66-
db dbtx
66+
db DBTX
6767
}
6868

6969
const getAuthor = `-- name: GetAuthor :one
@@ -141,16 +141,16 @@ import (
141141
"database/sql"
142142
)
143143

144-
type dbtx interface {
144+
type DBTX interface {
145145
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
146146
}
147147

148-
func New(db dbtx) *Queries {
148+
func New(db DBTX) *Queries {
149149
return &Queries{db: db}
150150
}
151151

152152
type Queries struct {
153-
db dbtx
153+
db DBTX
154154
}
155155

156156
const getBioForAuthor = `-- name: GetBioForAuthor :one

examples/returning.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ type Author struct {
3636
Bio string
3737
}
3838

39-
type dbtx interface {
39+
type DBTX interface {
4040
ExecContext(context.Context, string, ...interface{}) error
4141
QueryRowContext(context.Context, string, ...interface{}) error
4242
}
4343

44-
func New(db dbtx) *Queries {
44+
func New(db DBTX) *Queries {
4545
return &Queries{db: db}
4646
}
4747

4848
type Queries struct {
49-
db dbtx
49+
db DBTX
5050
}
5151

5252
const delete = `-- name: Delete :exec

examples/transactions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ type Record struct {
2424
ID int
2525
}
2626

27-
type dbtx interface {
27+
type DBTX interface {
2828
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
2929
}
3030

31-
func New(db dbtx) *Queries {
31+
func New(db DBTX) *Queries {
3232
return &Queries{db: db}
3333
}
3434

3535
type Queries struct {
36-
db dbtx
36+
db DBTX
3737
}
3838

3939
func (*Queries) WithTx(tx *sql.Tx) *Queries {

examples/update.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ import (
1919
"database/sql"
2020
)
2121

22-
type dbtx interface {
22+
type DBTX interface {
2323
ExecContext(context.Context, string, ...interface{}) error
2424
}
2525

26-
func New(db dbtx) *Queries {
26+
func New(db DBTX) *Queries {
2727
return &Queries{db: db}
2828
}
2929

3030
type Queries struct {
31-
db dbtx
31+
db DBTX
3232
}
3333

3434
const updateAuthor = `-- name: UpdateAuthor :exec

0 commit comments

Comments
 (0)