Merge pull request #141 from joshuarubin/master

kyleconroy · web-flow · commit dc74575f38a5 · 2019-12-05T11:35:35.000-08:00
Add a few types, export DBTX
diff --git a/README.md b/README.md
@@ -203,19 +203,19 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 	return items, nil
 }
 
-type dbtx interface {
+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 {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 func (q *Queries) WithTx(tx *sql.Tx) *Queries {
diff --git a/examples/any.md b/examples/any.md
@@ -36,17 +36,17 @@ type Author struct {
 	BirthYear int
 }
 
-type dbtx interface {
+type DBTX interface {
 	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const listAuthors = `-- name: ListAuthorsByIDs :many
diff --git a/examples/delete.md b/examples/delete.md
@@ -18,16 +18,16 @@ import (
 	"database/sql"
 )
 
-type dbtx interface {
+type DBTX interface {
 	ExecContext(context.Context, string, ...interface{}) error
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const deleteAuthor = `-- name: DeleteAuthor :exec
diff --git a/examples/insert.md b/examples/insert.md
@@ -18,16 +18,16 @@ import (
 	"database/sql"
 )
 
-type dbtx interface {
+type DBTX interface {
 	ExecContext(context.Context, string, ...interface{}) error
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const createAuthor = `-- name: CreateAuthor :exec
diff --git a/examples/prepared_query.md b/examples/prepared_query.md
@@ -25,16 +25,16 @@ type Record struct {
 	ID int
 }
 
-type dbtx interface {
+type DBTX interface {
 	PrepareContext(context.Context, string) (*sql.Stmt, error)
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
-func Prepare(ctx context.Context, db dbtx) (*Queries, error) {
+func Prepare(ctx context.Context, db DBTX) (*Queries, error) {
 	q := Queries{db: db}
 	var err error
 	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
 }
 
 type Queries struct {
-	db            dbtx
+	db            DBTX
 	tx            *sql.Tx
 	getRecordStmt *sql.Stmt
 }
diff --git a/examples/query_count.md b/examples/query_count.md
@@ -23,17 +23,17 @@ import (
 	"database/sql"
 )
 
-type dbtx interface {
+type DBTX interface {
 	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const countAuthors = `-- name: CountAuthors :one
diff --git a/examples/query_one.md b/examples/query_one.md
@@ -53,17 +53,17 @@ type Author struct {
 	BirthYear int
 }
 
-type dbtx interface {
+type DBTX interface {
 	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const getAuthor = `-- name: GetAuthor :one
@@ -141,16 +141,16 @@ import (
 	"database/sql"
 )
 
-type dbtx interface {
+type DBTX interface {
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const getBioForAuthor = `-- name: GetBioForAuthor :one
diff --git a/examples/returning.md b/examples/returning.md
@@ -36,17 +36,17 @@ type Author struct {
 	Bio string
 }
 
-type dbtx interface {
+type DBTX interface {
 	ExecContext(context.Context, string, ...interface{}) error
 	QueryRowContext(context.Context, string, ...interface{}) error
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const delete = `-- name: Delete :exec
diff --git a/examples/transactions.md b/examples/transactions.md
@@ -24,16 +24,16 @@ type Record struct {
 	ID int
 }
 
-type dbtx interface {
+type DBTX interface {
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 func (*Queries) WithTx(tx *sql.Tx) *Queries {
diff --git a/examples/update.md b/examples/update.md
@@ -19,16 +19,16 @@ import (
 	"database/sql"
 )
 
-type dbtx interface {
+type DBTX interface {
 	ExecContext(context.Context, string, ...interface{}) error
 }
 
-func New(db dbtx) *Queries {
+func New(db DBTX) *Queries {
 	return &Queries{db: db}
 }
 
 type Queries struct {
-	db dbtx
+	db DBTX
 }
 
 const updateAuthor = `-- name: UpdateAuthor :exec
diff --git a/internal/dinosql/gen.go b/internal/dinosql/gen.go
diff --git a/internal/dinosql/testdata/ondeck/db.go b/internal/dinosql/testdata/ondeck/db.go
diff --git a/internal/dinosql/testdata/ondeck/prepared/db.go b/internal/dinosql/testdata/ondeck/prepared/db.go

Original file line number	Diff line number	Diff line change
`@@ -203,19 +203,19 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {`
`203`	`203`	`return items, nil`
`204`	`204`	`}`
`205`	`205`
`206`		`-type dbtx interface {`
	`206`	`+type DBTX interface {`
`207`	`207`	`ExecContext(context.Context, string, ...interface{}) (sql.Result, error)`
`208`	`208`	`PrepareContext(context.Context, string) (*sql.Stmt, error)`
`209`	`209`	`QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)`
`210`	`210`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`211`	`211`	`}`
`212`	`212`
`213`		`-func New(db dbtx) *Queries {`
	`213`	`+func New(db DBTX) *Queries {`
`214`	`214`	`return &Queries{db: db}`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`type Queries struct {`
`218`		`- db dbtx`
	`218`	`+ db DBTX`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`func (q Queries) WithTx(tx sql.Tx) *Queries {`
Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,17 @@ type Author struct {`
`36`	`36`	`BirthYear int`
`37`	`37`	`}`
`38`	`38`
`39`		`-type dbtx interface {`
	`39`	`+type DBTX interface {`
`40`	`40`	`QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)`
`41`	`41`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`42`	`42`	`}`
`43`	`43`
`44`		`-func New(db dbtx) *Queries {`
	`44`	`+func New(db DBTX) *Queries {`
`45`	`45`	`return &Queries{db: db}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`type Queries struct {`
`49`		`- db dbtx`
	`49`	`+ db DBTX`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	const listAuthors = `-- name: ListAuthorsByIDs :many
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,16 @@ import (`
`18`	`18`	`"database/sql"`
`19`	`19`	`)`
`20`	`20`
`21`		`-type dbtx interface {`
	`21`	`+type DBTX interface {`
`22`	`22`	`ExecContext(context.Context, string, ...interface{}) error`
`23`	`23`	`}`
`24`	`24`
`25`		`-func New(db dbtx) *Queries {`
	`25`	`+func New(db DBTX) *Queries {`
`26`	`26`	`return &Queries{db: db}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`type Queries struct {`
`30`		`- db dbtx`
	`30`	`+ db DBTX`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	const deleteAuthor = `-- name: DeleteAuthor :exec
Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,16 @@ type Record struct {`
`25`	`25`	`ID int`
`26`	`26`	`}`
`27`	`27`
`28`		`-type dbtx interface {`
	`28`	`+type DBTX interface {`
`29`	`29`	`PrepareContext(context.Context, string) (*sql.Stmt, error)`
`30`	`30`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`31`	`31`	`}`
`32`	`32`
`33`		`-func New(db dbtx) *Queries {`
	`33`	`+func New(db DBTX) *Queries {`
`34`	`34`	`return &Queries{db: db}`
`35`	`35`	`}`
`36`	`36`
`37`		`-func Prepare(ctx context.Context, db dbtx) (*Queries, error) {`
	`37`	`+func Prepare(ctx context.Context, db DBTX) (*Queries, error) {`
`38`	`38`	`q := Queries{db: db}`
`39`	`39`	`var err error`
`40`	`40`	`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`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`type Queries struct {`
`58`		`- db dbtx`
	`58`	`+ db DBTX`
`59`	`59`	`tx *sql.Tx`
`60`	`60`	`getRecordStmt *sql.Stmt`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,17 @@ import (`
`23`	`23`	`"database/sql"`
`24`	`24`	`)`
`25`	`25`
`26`		`-type dbtx interface {`
	`26`	`+type DBTX interface {`
`27`	`27`	`QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)`
`28`	`28`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`29`	`29`	`}`
`30`	`30`
`31`		`-func New(db dbtx) *Queries {`
	`31`	`+func New(db DBTX) *Queries {`
`32`	`32`	`return &Queries{db: db}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`type Queries struct {`
`36`		`- db dbtx`
	`36`	`+ db DBTX`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	const countAuthors = `-- name: CountAuthors :one
Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,17 @@ type Author struct {`
`53`	`53`	`BirthYear int`
`54`	`54`	`}`
`55`	`55`
`56`		`-type dbtx interface {`
	`56`	`+type DBTX interface {`
`57`	`57`	`QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)`
`58`	`58`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`59`	`59`	`}`
`60`	`60`
`61`		`-func New(db dbtx) *Queries {`
	`61`	`+func New(db DBTX) *Queries {`
`62`	`62`	`return &Queries{db: db}`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`type Queries struct {`
`66`		`- db dbtx`
	`66`	`+ db DBTX`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	const getAuthor = `-- name: GetAuthor :one
`@@ -141,16 +141,16 @@ import (`
`141`	`141`	`"database/sql"`
`142`	`142`	`)`
`143`	`143`
`144`		`-type dbtx interface {`
	`144`	`+type DBTX interface {`
`145`	`145`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`146`	`146`	`}`
`147`	`147`
`148`		`-func New(db dbtx) *Queries {`
	`148`	`+func New(db DBTX) *Queries {`
`149`	`149`	`return &Queries{db: db}`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`type Queries struct {`
`153`		`- db dbtx`
	`153`	`+ db DBTX`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	const getBioForAuthor = `-- name: GetBioForAuthor :one
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,16 @@ type Record struct {`
`24`	`24`	`ID int`
`25`	`25`	`}`
`26`	`26`
`27`		`-type dbtx interface {`
	`27`	`+type DBTX interface {`
`28`	`28`	`QueryRowContext(context.Context, string, ...interface{}) *sql.Row`
`29`	`29`	`}`
`30`	`30`
`31`		`-func New(db dbtx) *Queries {`
	`31`	`+func New(db DBTX) *Queries {`
`32`	`32`	`return &Queries{db: db}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`type Queries struct {`
`36`		`- db dbtx`
	`36`	`+ db DBTX`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (Queries) WithTx(tx sql.Tx) *Queries {`
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,16 @@ import (`
`19`	`19`	`"database/sql"`
`20`	`20`	`)`
`21`	`21`
`22`		`-type dbtx interface {`
	`22`	`+type DBTX interface {`
`23`	`23`	`ExecContext(context.Context, string, ...interface{}) error`
`24`	`24`	`}`
`25`	`25`
`26`		`-func New(db dbtx) *Queries {`
	`26`	`+func New(db DBTX) *Queries {`
`27`	`27`	`return &Queries{db: db}`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`type Queries struct {`
`31`		`- db dbtx`
	`31`	`+ db DBTX`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	const updateAuthor = `-- name: UpdateAuthor :exec