Rebase latest changes

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -9,6 +9,7 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
+        - 1.16.0
         - 1.15.0
         - 1.14.0
         - 1.13.0

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.19.3 AS builder
+FROM golang:1.20.0 AS builder
 
 COPY . /workspace
 WORKDIR /workspace

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build build-endtoend test test-ci test-examples test-endtoend regen start psql mysqlsh
+.PHONY: build build-endtoend test test-ci test-examples test-endtoend regen start psql mysqlsh proto
 
 build:
 	go build ./...
@@ -44,16 +44,5 @@ psql:
 mysqlsh:
 	mysqlsh --sql --user root --password mysecretpassword --database dinotest 127.0.0.1:3306
 
-# $ protoc --version
-# libprotoc 3.19.1
-# $ go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-# $ go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto
-proto: internal/plugin/codegen.pb.go
-
-internal/plugin/codegen.pb.go: protos/plugin/codegen.proto
-	protoc -I ./protos \
-		--go_out=. \
-		--go_opt=module=github.com/kyleconroy/sqlc \
-		--go-vtproto_out=. \
-		--go-vtproto_opt=module=github.com/kyleconroy/sqlc,features=marshal+unmarshal+size \
-		./protos/plugin/codegen.proto
+proto:
+	buf generate

buf.gen.yaml

@@ -0,0 +1,10 @@
+version: v1
+managed:
+  enabled: true
+plugins:
+  - remote: buf.build/protocolbuffers/plugins/go:v1.28.1-1
+    out: internal
+    opt: paths=source_relative
+  - remote: buf.build/planetscale/plugins/vtproto:v0.3.0
+    out: internal
+    opt: paths=source_relative

buf.work.yaml

@@ -0,0 +1,3 @@
+version: v1
+directories:
+  - protos

docs/howto/delete.md

@@ -19,7 +19,7 @@ import (
 )
 
 type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) error
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
 }
 
 func New(db DBTX) *Queries {

docs/howto/insert.md

@@ -19,7 +19,7 @@ import (
 )
 
 type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) error
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
 }
 
 func New(db DBTX) *Queries {
@@ -45,24 +45,28 @@ func (q *Queries) CreateAuthor(ctx context.Context, bio string) error {
 sqlc has full support for the `RETURNING` statement.
 
 ```sql
+-- Example queries for sqlc
 CREATE TABLE authors (
-  id         SERIAL PRIMARY KEY,
-  bio        text   NOT NULL
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text
 );
 
--- name: Delete :exec
-DELETE FROM authors WHERE id = $1;
-
--- name: DeleteAffected :execrows
-DELETE FROM authors WHERE id = $1;
+-- name: CreateAuthor :one
+INSERT INTO authors (
+  name, bio
+) VALUES (
+  $1, $2
+)
+RETURNING *;
 
--- name: DeleteID :one
-DELETE FROM authors WHERE id = $1
+-- name: CreateAuthorAndReturnId :one
+INSERT INTO authors (
+  name, bio
+) VALUES (
+  $1, $2
+)
 RETURNING id;
-
--- name: DeleteAuthor :one
-DELETE FROM authors WHERE id = $1
-RETURNING *;
 ```
 
 ```go
@@ -73,67 +77,46 @@ import (
 	"database/sql"
 )
 
-type Author struct {
-	ID  int
-	Bio string
-}
-
-type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) error
-	QueryRowContext(context.Context, string, ...interface{}) error
-}
-
-func New(db DBTX) *Queries {
-	return &Queries{db: db}
-}
-
-type Queries struct {
-	db DBTX
-}
-
-const delete = `-- name: Delete :exec
-DELETE FROM authors WHERE id = $1
+const createAuthor = `-- name: CreateAuthor :one
+INSERT INTO authors (
+  name, bio
+) VALUES (
+  $1, $2
+)
+RETURNING id, name, bio
 `
 
-func (q *Queries) Delete(ctx context.Context, id int) error {
-	_, err := q.db.ExecContext(ctx, delete, id)
-	return err
+type CreateAuthorParams struct {
+	Name string
+	Bio  sql.NullString
 }
 
-const deleteAffected = `-- name: DeleteAffected :execrows
-DELETE FROM authors WHERE id = $1
-`
-
-func (q *Queries) DeleteAffected(ctx context.Context, id int) (int64, error) {
-	result, err := q.db.ExecContext(ctx, deleteAffected, id)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
+func (q *Queries) CreateAuthor(ctx context.Context, arg CreateAuthorParams) (Author, error) {
+	row := q.db.QueryRowContext(ctx, createAuthor, arg.Name, arg.Bio)
+	var i Author
+	err := row.Scan(&i.ID, &i.Name, &i.Bio)
+	return i, err
 }
 
-const deleteID = `-- name: DeleteID :one
-DELETE FROM authors WHERE id = $1
+const createAuthorAndReturnId = `-- name: CreateAuthorAndReturnId :one
+INSERT INTO authors (
+  name, bio
+) VALUES (
+  $1, $2
+)
 RETURNING id
 `
 
-func (q *Queries) DeleteID(ctx context.Context, id int) (int, error) {
-	row := q.db.QueryRowContext(ctx, deleteID, id)
-	var i int
-	err := row.Scan(&i)
-	return i, err
+type CreateAuthorAndReturnIdParams struct {
+	Name string
+	Bio  sql.NullString
 }
 
-const deleteAuthor = `-- name: DeleteAuthor :one
-DELETE FROM authors WHERE id = $1
-RETURNING id, bio
-`
-
-func (q *Queries) DeleteAuthor(ctx context.Context, id int) (Author, error) {
-	row := q.db.QueryRowContext(ctx, deleteAuthor, id)
-	var i Author
-	err := row.Scan(&i.ID, &i.Bio)
-	return i, err
+func (q *Queries) CreateAuthorAndReturnId(ctx context.Context, arg CreateAuthorAndReturnIdParams) (int64, error) {
+	row := q.db.QueryRowContext(ctx, createAuthorAndReturnId, arg.Name, arg.Bio)
+	var id int64
+	err := row.Scan(&id)
+	return id, err
 }
 ```
 

docs/howto/prepared_query.md

@@ -19,10 +19,11 @@ package db
 import (
 	"context"
 	"database/sql"
+	"fmt"
 )
 
 type Record struct {
-	ID int
+	ID int32
 }
 
 type DBTX interface {
@@ -38,7 +39,7 @@ 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 {
-		return nil, err
+		return nil, fmt.Errorf("error preparing query GetRecord: %w", err)
 	}
 	return &q, nil
 }
@@ -73,11 +74,10 @@ SELECT id FROM records
 WHERE id = $1
 `
 
-func (q *Queries) GetRecord(ctx context.Context, id int) (Record, error) {
+func (q *Queries) GetRecord(ctx context.Context, id int32) (int32, error) {
 	row := q.queryRow(ctx, q.getRecordStmt, getRecord, id)
-	var i Record
-	err := row.Scan(&i.ID)
-	return i, err
+	err := row.Scan(&id)
+	return id, err
 }
 ```
 

docs/howto/update.md

@@ -26,7 +26,7 @@ import (
 )
 
 type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) error
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
 }
 
 func New(db DBTX) *Queries {
@@ -52,6 +52,12 @@ func (q *Queries) UpdateAuthorBios(ctx context.Context, bio string) error {
 If your query has more than one parameter, your Go method will accept a
 `Params` struct.
 
+```sql
+-- name: UpdateAuthor :exec
+UPDATE authors SET bio = $2
+WHERE id = $1;
+```
+
 ```go
 package db
 
@@ -61,7 +67,7 @@ import (
 )
 
 type DBTX interface {
-	ExecContext(context.Context, string, ...interface{}) error
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
 }
 
 func New(db DBTX) *Queries {

docs/reference/datatypes.md

@@ -133,6 +133,18 @@ type Author struct {
 }
 ```
 
+For MySQL, there is no native `uuid` data type. When using `UUID_TO_BIN` to store a `UUID()`, the underlying field type is `BINARY(16)` which by default sqlc would interpret this to `sql.NullString`. To have sqlc automatically convert these fields to a `uuid.UUID` type, use an overide on the column storing the `uuid`.
+```json
+{
+  "overrides": [
+    {
+      "column": "*.uuid",
+      "go_type": "github.com/google/uuid.UUID"
+    }
+  ]
+}
+```
+
 ## JSON
 
 By default, sqlc will generate the `[]byte`, `pgtype.JSON` or `json.RawMessage` for JSON column type.
@@ -160,7 +172,11 @@ CREATE TABLE books (
   "overrides": [
     {
       "column": "books.data",
-      "go_type": "*example.com/db/dto.BookData"
+      "go_type": {
+        "import":"example/db",
+        "package": "dto",
+        "type":"BookData"
+      }
     }
   ]
 }
@@ -176,4 +192,4 @@ import (
 type Book struct {
     Data *dto.BookData
 }
-```
+```

docs/requirements.txt

@@ -1,6 +1,6 @@
 alabaster==0.7.12
 Babel==2.9.1
-certifi==2020.12.5
+certifi==2022.12.7
 chardet==4.0.0
 commonmark==0.9.1
 docutils==0.16