wancat/go-backend-starter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: move db gen out, emit json field

Browse Source
This commit is contained in:
Justin Lin
2025-08-26 20:58:39 +10:00
parent e770b31402
commit 7ced3985b1
15 changed files with 63 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/author/controller.go
View File

@@ -4,26 +4,26 @@ import (
"strconv"
"github.com/gin-gonic/gin"
"tutorial.sqlc.dev/app/internal/author/gen"
"tutorial.sqlc.dev/app/internal/db"
)
type Controller struct {
queries gen.Queries
q db.Querier
}
func NewController(conn gen.DBTX) Controller {
func NewController(queries db.Querier) Controller {
return Controller{
queries: *gen.New(conn),
q: queries,
}
}
func (u *Controller) ListAuthors(c *gin.Context) {
authors, err := u.queries.ListAuthors(c.Request.Context())
authors, err := u.q.ListAuthors(c.Request.Context())
if err != nil {
c.AbortWithError(500, err)
return
}
c.JSON(200, toAuthorSlice(authors))
c.JSON(200, authors)
}
func (u *Controller) GetAuthorByID(c *gin.Context) {
@@ -33,11 +33,11 @@ func (u *Controller) GetAuthorByID(c *gin.Context) {
c.AbortWithError(400, err)
return
}
author, err := u.queries.GetAuthor(c.Request.Context(), int64(id))
author, err := u.q.GetAuthor(c.Request.Context(), int64(id))
if err != nil {
c.JSON(400, gin.H{"message": "Author not found"})
return
}
c.JSON(200, toAuthor(author))
c.JSON(200, author)
}

32
internal/author/gen/db.go
View File

@@ -1,32 +0,0 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.29.0
package gen
import (
"context"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
)
type DBTX interface {
Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
Query(context.Context, string, ...interface{}) (pgx.Rows, error)
QueryRow(context.Context, string, ...interface{}) pgx.Row
}
func New(db DBTX) *Queries {
return &Queries{db: db}
}
type Queries struct {
db DBTX
}
func (q *Queries) WithTx(tx pgx.Tx) *Queries {
return &Queries{
db: tx,
}
}

15
internal/author/gen/models.go
View File

@@ -1,15 +0,0 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.29.0
package gen
import (
"github.com/jackc/pgx/v5/pgtype"
)
type Author struct {
ID int64
Name string
Bio pgtype.Text
}

99
internal/author/gen/query.sql.go
View File

@@ -1,99 +0,0 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.29.0
// source: query.sql
package gen
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
)
const createAuthor = `-- name: CreateAuthor :one
INSERT INTO authors (
name, bio
) VALUES (
$1, $2
)
RETURNING id, name, bio
`
type CreateAuthorParams struct {
Name string
Bio pgtype.Text
}
func (q *Queries) CreateAuthor(ctx context.Context, arg CreateAuthorParams) (Author, error) {
row := q.db.QueryRow(ctx, createAuthor, arg.Name, arg.Bio)
var i Author
err := row.Scan(&i.ID, &i.Name, &i.Bio)
return i, err
}
const deleteAuthor = `-- name: DeleteAuthor :exec
DELETE FROM authors
WHERE id = $1
`
func (q *Queries) DeleteAuthor(ctx context.Context, id int64) error {
_, err := q.db.Exec(ctx, deleteAuthor, id)
return err
}
const getAuthor = `-- name: GetAuthor :one
SELECT id, name, bio FROM authors
WHERE id = $1 LIMIT 1
`
func (q *Queries) GetAuthor(ctx context.Context, id int64) (Author, error) {
row := q.db.QueryRow(ctx, getAuthor, id)
var i Author
err := row.Scan(&i.ID, &i.Name, &i.Bio)
return i, err
}
const listAuthors = `-- name: ListAuthors :many
SELECT id, name, bio FROM authors
ORDER BY name
`
func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
rows, err := q.db.Query(ctx, listAuthors)
if err != nil {
return nil, err
}
defer rows.Close()
var items []Author
for rows.Next() {
var i Author
if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil {
return nil, err
}
items = append(items, i)
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
const updateAuthor = `-- name: UpdateAuthor :exec
UPDATE authors
set name = $2,
bio = $3
WHERE id = $1
RETURNING id, name, bio
`
type UpdateAuthorParams struct {
ID int64
Name string
Bio pgtype.Text
}
func (q *Queries) UpdateAuthor(ctx context.Context, arg UpdateAuthorParams) error {
_, err := q.db.Exec(ctx, updateAuthor, arg.ID, arg.Name, arg.Bio)
return err
}

8
internal/author/mapper.go
View File

@@ -1,10 +1,12 @@
package author
import "tutorial.sqlc.dev/app/internal/author/gen"
import (
"tutorial.sqlc.dev/app/internal/db"
)
func toAuthor(a gen.Author) Author {
func toAuthor(a db.Author) Author {
return Author{
a.ID, a.Name, a.Bio.String,
a.ID, a.Name, a.Bio,
}
}

6
internal/author/model.go
View File

@@ -1,7 +1,7 @@
package author
type Author struct {
ID int64 `json:"id"`
Name string `json:"name"`
Bio string `json:"bio"`
ID int64 `json:"id"`
Name string `json:"name"`
Bio *string `json:"bio"`
}

26
internal/author/query.sql
View File

@@ -1,26 +0,0 @@
-- name: GetAuthor :one
SELECT * FROM authors
WHERE id = $1 LIMIT 1;
-- name: ListAuthors :many
SELECT * FROM authors
ORDER BY name;
-- name: CreateAuthor :one
INSERT INTO authors (
name, bio
) VALUES (
$1, $2
)
RETURNING *;
-- name: UpdateAuthor :exec
UPDATE authors
set name = $2,
bio = $3
WHERE id = $1
RETURNING *;
-- name: DeleteAuthor :exec
DELETE FROM authors
WHERE id = $1;

5
internal/author/schema.sql
View File

@@ -1,5 +0,0 @@
CREATE TABLE authors (
id BIGSERIAL PRIMARY KEY,
name text NOT NULL,
bio text
);