refactor(store): sqlc override uuid→google/uuid.UUID (убирает pgtype boilerplate)

This commit is contained in:
2026-07-03 14:20:03 +07:00
parent 34bc49ee8c
commit 635b05361f
8 changed files with 65 additions and 62 deletions
+11 -11
View File
@@ -8,7 +8,7 @@ package db
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
"github.com/google/uuid"
)
const createAccount = `-- name: CreateAccount :one
@@ -18,11 +18,11 @@ RETURNING id, project_id, provider, secret_enc, comment, created_at
`
type CreateAccountParams struct {
ID pgtype.UUID `json:"id"`
ProjectID pgtype.UUID `json:"project_id"`
Provider string `json:"provider"`
SecretEnc string `json:"secret_enc"`
Comment string `json:"comment"`
ID uuid.UUID `json:"id"`
ProjectID uuid.UUID `json:"project_id"`
Provider string `json:"provider"`
SecretEnc string `json:"secret_enc"`
Comment string `json:"comment"`
}
func (q *Queries) CreateAccount(ctx context.Context, arg CreateAccountParams) (ProviderAccount, error) {
@@ -50,8 +50,8 @@ DELETE FROM provider_accounts WHERE id = $1 AND project_id = $2
`
type DeleteAccountParams struct {
ID pgtype.UUID `json:"id"`
ProjectID pgtype.UUID `json:"project_id"`
ID uuid.UUID `json:"id"`
ProjectID uuid.UUID `json:"project_id"`
}
func (q *Queries) DeleteAccount(ctx context.Context, arg DeleteAccountParams) error {
@@ -64,8 +64,8 @@ SELECT id, project_id, provider, secret_enc, comment, created_at FROM provider_a
`
type GetAccountParams struct {
ID pgtype.UUID `json:"id"`
ProjectID pgtype.UUID `json:"project_id"`
ID uuid.UUID `json:"id"`
ProjectID uuid.UUID `json:"project_id"`
}
func (q *Queries) GetAccount(ctx context.Context, arg GetAccountParams) (ProviderAccount, error) {
@@ -86,7 +86,7 @@ const listAccounts = `-- name: ListAccounts :many
SELECT id, project_id, provider, secret_enc, comment, created_at FROM provider_accounts WHERE project_id = $1 ORDER BY created_at
`
func (q *Queries) ListAccounts(ctx context.Context, projectID pgtype.UUID) ([]ProviderAccount, error) {
func (q *Queries) ListAccounts(ctx context.Context, projectID uuid.UUID) ([]ProviderAccount, error) {
rows, err := q.db.Query(ctx, listAccounts, projectID)
if err != nil {
return nil, err