oneao/workspace
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
oneao committed 2025-11-30 22:40:56 +08:00
1 parent 5308dc8fda
commit d51eacb8ad
32 files changed
+1788 -513
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/base-project/base-go-v3/db/index.go
+61 -5
View File
@@ -1,20 +1,25 @@
// db/db.go
package db
import (
"cn/oneao/base-go/conf"
sqlcg "cn/oneao/base-go/db/sqlc"
"cn/oneao/base-go/db/repo"
"context"
"fmt"
"github.com/jackc/pgx/v5/pgxpool"
"time"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
)
var (
DB *pgxpool.Pool
Queries *sqlcg.Queries
Queries *repo.Queries
)
type SQLCBatch interface {
Exec(func(int, error))
}
func InitDB() {
cfg := conf.GetConf().Pgsql
@@ -63,5 +68,56 @@ func InitDB() {
}
DB = pool
Queries = sqlcg.New(DB)
Queries = repo.New(DB)
}
// WithTx 执行事务，支持 panic 和 error 自动回滚
// 默认使用全局 DB，调用更简洁
func WithTx(ctx context.Context, fn func(q *repo.Queries) error) (err error) {
return WithTxPool(ctx, DB, fn)
}
// WithTxPool 支持自定义连接池
func WithTxPool(ctx context.Context, pool *pgxpool.Pool, fn func(q *repo.Queries) error) (err error) {
tx, err := pool.BeginTx(ctx, pgx.TxOptions{})
if err != nil {
return err
}
defer func() {
if p := recover(); p != nil {
// panic 时回滚事务
if rbErr := tx.Rollback(ctx); rbErr != nil {
fmt.Printf("rollback failed during panic: %v\n", rbErr)
}
panic(p)
} else if err != nil {
// 回滚事务，并捕获 rollback 错误
if rbErr := tx.Rollback(ctx); rbErr != nil {
err = fmt.Errorf("rollback failed: %v, original error: %w", rbErr, err)
}
} else {
// 提交事务，并捕获 commit 错误
if commitErr := tx.Commit(ctx); commitErr != nil {
err = fmt.Errorf("commit failed: %w", commitErr)
}
}
}()
q := Queries.WithTx(tx)
err = fn(q)
return err
}
// RunBatch 通用批处理执行器（适配所有 sqlc Batch）
func RunBatch(ctx context.Context, batch SQLCBatch) error {
var firstErr error
batch.Exec(func(i int, err error) {
if err != nil && firstErr == nil {
firstErr = err
}
})
return firstErr
}
code/base-project/base-go-v3/db/queries/money_record.sql
+11
View File
@@ -0,0 +1,11 @@
-- name: FindUserMoneyRecords :many
SELECT
mr.*,
muc.name AS category_name,
muc.icon AS category_icon,
muc.type AS category_type
FROM money_record mr
LEFT JOIN money_user_category muc ON mr.category_id = muc.id
WHERE mr.user_id = $1
AND mr.record_time BETWEEN $2 AND $3
ORDER BY mr.record_time DESC, mr.create_time DESC;
code/base-project/base-go-v3/db/queries/money_user_category.sql
+5
View File
@@ -10,3 +10,8 @@ WHERE user_id = $1;
-- name: DeleteUserMoneyCategoryById :exec
DELETE FROM money_user_category
WHERE id = $1;
-- name: BatchUpdateMoneyCategorySort :batchexec
UPDATE money_user_category
SET sort_number = $2
WHERE id = $1;
code/base-project/base-go-v3/db/repo/batch.go
+68
View File
@@ -0,0 +1,68 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.30.0
// source: batch.go
package repo
import (
"context"
"errors"
"github.com/jackc/pgx/v5"
)
var (
ErrBatchAlreadyClosed = errors.New("batch already closed")
)
const batchUpdateMoneyCategorySort = `-- name: BatchUpdateMoneyCategorySort :batchexec
UPDATE money_user_category
SET sort_number = $2
WHERE id = $1
`
type BatchUpdateMoneyCategorySortBatchResults struct {
br pgx.BatchResults
tot int
closed bool
}
type BatchUpdateMoneyCategorySortParams struct {
ID int64
SortNumber int32
}
func (q *Queries) BatchUpdateMoneyCategorySort(ctx context.Context, arg []BatchUpdateMoneyCategorySortParams) *BatchUpdateMoneyCategorySortBatchResults {
batch := &pgx.Batch{}
for _, a := range arg {
vals := []interface{}{
a.ID,
a.SortNumber,
}
batch.Queue(batchUpdateMoneyCategorySort, vals...)
}
br := q.db.SendBatch(ctx, batch)
return &BatchUpdateMoneyCategorySortBatchResults{br, len(arg), false}
}
func (b *BatchUpdateMoneyCategorySortBatchResults) Exec(f func(int, error)) {
defer b.br.Close()
for t := 0; t < b.tot; t++ {
if b.closed {
if f != nil {
f(t, ErrBatchAlreadyClosed)
}
continue
}
_, err := b.br.Exec()
if f != nil {
f(t, err)
}
}
}
func (b *BatchUpdateMoneyCategorySortBatchResults) Close() error {
b.closed = true
return b.br.Close()
}
code/base-project/base-go-v3/db/sqlc/copyfrom.go → code/base-project/base-go-v3/db/repo/copyfrom.go
+1 -1
View File
@@ -3,7 +3,7 @@
// sqlc v1.30.0
// source: copyfrom.go
package dbtype
package repo
import (
"context"
code/base-project/base-go-v3/db/sqlc/db.go → code/base-project/base-go-v3/db/repo/db.go
+2 -1
View File
@@ -2,7 +2,7 @@
// versions:
// sqlc v1.30.0
package dbtype
package repo
import (
"context"
@@ -16,6 +16,7 @@ type DBTX interface {
Query(context.Context, string, ...interface{}) (pgx.Rows, error)
QueryRow(context.Context, string, ...interface{}) pgx.Row
CopyFrom(ctx context.Context, tableName pgx.Identifier, columnNames []string, rowSrc pgx.CopyFromSource) (int64, error)
SendBatch(context.Context, *pgx.Batch) pgx.BatchResults
}
func New(db DBTX) *Queries {
code/base-project/base-go-v3/db/sqlc/models.go → code/base-project/base-go-v3/db/repo/models.go
+5 -5
View File
@@ -2,7 +2,7 @@
// versions:
// sqlc v1.30.0
package dbtype
package repo
import (
"github.com/jackc/pgx/v5/pgtype"
@@ -23,8 +23,8 @@ type MoneySysCategory struct {
ID int64
Name string
Icon string
Type pgtype.Int4
SortNumber pgtype.Int4
Type int32
SortNumber int32
CreateTime pgtype.Timestamp
}
@@ -33,8 +33,8 @@ type MoneyUserCategory struct {
UserID int64
Name string
Icon string
Type pgtype.Int4
SortNumber pgtype.Int4
Type int32
SortNumber int32
CreateTime pgtype.Timestamp
}
code/base-project/base-go-v3/db/repo/money_record.sql.go
+77
View File
@@ -0,0 +1,77 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.30.0
// source: money_record.sql
package repo
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
)
const findUserMoneyRecords = `-- name: FindUserMoneyRecords :many
SELECT
mr.id, mr.category_id, mr.user_id, mr.amount, mr.remark, mr.record_time, mr.create_time, mr.update_time,
muc.name AS category_name,
muc.icon AS category_icon,
muc.type AS category_type
FROM money_record mr
LEFT JOIN money_user_category muc ON mr.category_id = muc.id
WHERE mr.user_id = $1
AND mr.record_time BETWEEN $2 AND $3
ORDER BY mr.record_time DESC, mr.create_time DESC
`
type FindUserMoneyRecordsParams struct {
UserID int64
RecordTime pgtype.Timestamp
RecordTime_2 pgtype.Timestamp
}
type FindUserMoneyRecordsRow struct {
ID int64
CategoryID int64
UserID int64
Amount pgtype.Numeric
Remark pgtype.Text
RecordTime pgtype.Timestamp
CreateTime pgtype.Timestamp
UpdateTime pgtype.Timestamp
CategoryName pgtype.Text
CategoryIcon pgtype.Text
CategoryType pgtype.Int4
}
func (q *Queries) FindUserMoneyRecords(ctx context.Context, arg FindUserMoneyRecordsParams) ([]FindUserMoneyRecordsRow, error) {
rows, err := q.db.Query(ctx, findUserMoneyRecords, arg.UserID, arg.RecordTime, arg.RecordTime_2)
if err != nil {
return nil, err
}
defer rows.Close()
var items []FindUserMoneyRecordsRow
for rows.Next() {
var i FindUserMoneyRecordsRow
if err := rows.Scan(
&i.ID,
&i.CategoryID,
&i.UserID,
&i.Amount,
&i.Remark,
&i.RecordTime,
&i.CreateTime,
&i.UpdateTime,
&i.CategoryName,
&i.CategoryIcon,
&i.CategoryType,
); err != nil {
return nil, err
}
items = append(items, i)
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
code/base-project/base-go-v3/db/sqlc/money_sys_category.sql.go → code/base-project/base-go-v3/db/repo/money_sys_category.sql.go
+1 -1
View File
@@ -3,7 +3,7 @@
// sqlc v1.30.0
// source: money_sys_category.sql
package dbtype
package repo
import (
"context"
code/base-project/base-go-v3/db/sqlc/money_user_category.sql.go → code/base-project/base-go-v3/db/repo/money_user_category.sql.go
+3 -5
View File
@@ -3,12 +3,10 @@
// sqlc v1.30.0
// source: money_user_category.sql
package dbtype
package repo
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
)
type BatchInsertMoneyUserCategoriesParams struct {
@@ -16,8 +14,8 @@ type BatchInsertMoneyUserCategoriesParams struct {
UserID int64
Name string
Icon string
Type pgtype.Int4
SortNumber pgtype.Int4
Type int32
SortNumber int32
}
const deleteUserMoneyCategoryById = `-- name: DeleteUserMoneyCategoryById :exec
code/base-project/base-go-v3/db/sqlc/user_info.sql.go → code/base-project/base-go-v3/db/repo/user_info.sql.go
+1 -1
View File
@@ -3,7 +3,7 @@
// sqlc v1.30.0
// source: user_info.sql
package dbtype
package repo
import (
"context"
code/base-project/base-go-v3/db/schema.sql
+5 -5
View File
@@ -26,17 +26,17 @@ CREATE TABLE money_sys_category(
id BIGINT PRIMARY KEY ,
name VARCHAR(255) NOT NULL ,
icon VARCHAR(255) NOT NULL,
type INT DEFAULT 0,
sort_number INT DEFAULT 0,
type INT NOT NULL DEFAULT 0 ,
sort_number INT NOT NULL DEFAULT 0,
create_time timestamp DEFAULT CURRENT_TIMESTAMP
);
CREATE TABLE money_user_category(
id BIGINT PRIMARY KEY ,
user_id BIGINT NOT NULL,
name VARCHAR(255) NOT NULL ,
name VARCHAR(255) NOT NULL,
icon VARCHAR(255) NOT NULL,
type INT DEFAULT 0,
sort_number INT DEFAULT 0,
type INT NOT NULL DEFAULT 0,
sort_number INT NOT NULL DEFAULT 0,
create_time timestamp DEFAULT CURRENT_TIMESTAMP
)