Compare commits
No commits in common. "main" and "v1.0.11" have entirely different histories.
10
Base.go
10
Base.go
@ -68,10 +68,7 @@ func basePrepare(db *sql.DB, tx *sql.Tx, query string) *Stmt {
|
||||
}
|
||||
|
||||
func baseExec(db *sql.DB, tx *sql.Tx, query string, args ...any) *ExecResult {
|
||||
return baseExecRaw(db, tx, query, flatArgs(args)...)
|
||||
}
|
||||
|
||||
func baseExecRaw(db *sql.DB, tx *sql.Tx, query string, args ...any) *ExecResult {
|
||||
args = flatArgs(args)
|
||||
var r sql.Result
|
||||
var err error
|
||||
startTime := time.Now()
|
||||
@ -110,10 +107,8 @@ func flatArgs(args []any) []any {
|
||||
}
|
||||
|
||||
func baseQuery(db *sql.DB, tx *sql.Tx, query string, args ...any) *QueryResult {
|
||||
return baseQueryRaw(db, tx, query, flatArgs(args)...)
|
||||
}
|
||||
args = flatArgs(args)
|
||||
|
||||
func baseQueryRaw(db *sql.DB, tx *sql.Tx, query string, args ...any) *QueryResult {
|
||||
var rows *sql.Rows
|
||||
var err error
|
||||
startTime := time.Now()
|
||||
@ -133,7 +128,6 @@ func baseQueryRaw(db *sql.DB, tx *sql.Tx, query string, args ...any) *QueryResul
|
||||
return &QueryResult{Sql: &query, Args: args, usedTime: usedTime, rows: rows}
|
||||
}
|
||||
|
||||
|
||||
func quote(quoteTag string, text string) string {
|
||||
a := strings.Split(text, ".")
|
||||
for i, v := range a {
|
||||
|
||||
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,17 +1,5 @@
|
||||
# 变更记录 - @go/db
|
||||
|
||||
## [1.0.12] - 2026-05-17
|
||||
- **SQLite 极致优化 (超高并发支持)**:
|
||||
- **读写分离与零锁读取**: 读操作 (`Query`) 实现零锁定，配合 WAL 模式彻底解决读写互斥问题；写操作由应用层 `sync.Mutex` 统一排队，规避 `database is locked` 错误。
|
||||
- **临界区最小化**: 将 FTS 重写、参数 JSON 化 (`flatArgs`) 及日志记录移出锁保护区，极大缩短了写锁持有时间。
|
||||
- **工业级默认配置**:
|
||||
- 自动启用 `WAL` 模式、`NORMAL` 同步、`MEMORY` 临时存储及 `busy_timeout(5000)`。
|
||||
- 引入 **动态 Mmap**：根据系统内存自动设置 `mmap_size` (最大 30GB 或物理内存的 1/4)，使大数据量访问接近内存速度。
|
||||
- 默认 `MaxOpenConns` 提升至 100，优化多线程只读性能。
|
||||
- **稳定性**:
|
||||
- 为 `Stmt` (预处理语句) 增加写锁保护。
|
||||
- 优化事务锁机制，支持事务内的锁自动追踪与释放。
|
||||
|
||||
## [1.0.11] - 2026-05-13
|
||||
- **基础设施对齐**:
|
||||
- 移除 `encoding/json` 原生依赖，全面切换至 `apigo.cc/go/cast.UnmarshalJSON` 以增强类型兼容性。
|
||||
|
||||
206
DB.go
206
DB.go
@ -19,6 +19,7 @@ import (
|
||||
"apigo.cc/go/crypto"
|
||||
"apigo.cc/go/id"
|
||||
"apigo.cc/go/log"
|
||||
"apigo.cc/go/rand"
|
||||
"apigo.cc/go/redis"
|
||||
"apigo.cc/go/safe"
|
||||
)
|
||||
@ -193,7 +194,6 @@ type DB struct {
|
||||
QuoteTag string
|
||||
tables map[string]*TableStruct
|
||||
tablesLock *sync.RWMutex
|
||||
sqliteMu *sync.Mutex // Serial lock for SQLite writers
|
||||
}
|
||||
|
||||
type TableStruct struct {
|
||||
@ -318,7 +318,7 @@ func (db *DB) NextID(table string) string {
|
||||
|
||||
func (db *DB) syncVersionFromDB(table, versionField string) {
|
||||
query := fmt.Sprintf("SELECT MAX(%s) FROM %s", db.Quote(versionField), db.Quote(table))
|
||||
maxVer := db.rawQuery(query).IntOnR1C1()
|
||||
maxVer := db.Query(query).IntOnR1C1()
|
||||
|
||||
if db.Config.Redis != "" {
|
||||
r := redis.GetRedis(db.Config.Redis, db.logger.logger)
|
||||
@ -349,69 +349,6 @@ func GetDB(name string, logger *log.Logger) *DB {
|
||||
return getDB(name, logger, true)
|
||||
}
|
||||
|
||||
// Sync 同步数据库结构 (使用默认实例 "default")
|
||||
func Sync(desc string) error {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return errors.New("default db not configured")
|
||||
}
|
||||
return d.Sync(desc)
|
||||
}
|
||||
|
||||
// Insert 插入数据 (使用默认实例 "default")
|
||||
func Insert(table string, data any) *ExecResult {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &ExecResult{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Insert(table, data)
|
||||
}
|
||||
|
||||
// Update 更新数据 (使用默认实例 "default")
|
||||
func Update(table string, data any, conditions string, args ...any) *ExecResult {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &ExecResult{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Update(table, data, conditions, args...)
|
||||
}
|
||||
|
||||
// Delete 删除数据 (使用默认实例 "default")
|
||||
func Delete(table string, conditions string, args ...any) *ExecResult {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &ExecResult{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Delete(table, conditions, args...)
|
||||
}
|
||||
|
||||
// Query 查询数据 (使用默认实例 "default")
|
||||
func Query(query string, args ...any) *QueryResult {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &QueryResult{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Query(query, args...)
|
||||
}
|
||||
|
||||
// Exec 执行 SQL (使用默认实例 "default")
|
||||
func Exec(query string, args ...any) *ExecResult {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &ExecResult{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Exec(query, args...)
|
||||
}
|
||||
|
||||
// Begin 开始事务 (使用默认实例 "default")
|
||||
func Begin() *Tx {
|
||||
d := GetDB("default", nil)
|
||||
if d == nil {
|
||||
return &Tx{Error: errors.New("default db not configured")}
|
||||
}
|
||||
return d.Begin()
|
||||
}
|
||||
|
||||
func getDB(name string, logger *log.Logger, useCache bool) *DB {
|
||||
if logger == nil {
|
||||
logger = log.DefaultLogger
|
||||
@ -537,9 +474,6 @@ func getDB(name string, logger *log.Logger, useCache bool) *DB {
|
||||
db.conn = conn
|
||||
db.tables = make(map[string]*TableStruct)
|
||||
db.tablesLock = new(sync.RWMutex)
|
||||
if conf.Type == "sqlite" || conf.Type == "sqlite3" {
|
||||
db.sqliteMu = new(sync.Mutex)
|
||||
}
|
||||
|
||||
if conf.ReadonlyHosts != nil {
|
||||
readonlyConnections := make([]*sql.DB, 0)
|
||||
@ -558,9 +492,6 @@ func getDB(name string, logger *log.Logger, useCache bool) *DB {
|
||||
|
||||
db.Error = nil
|
||||
db.Config = conf
|
||||
if (conf.Type == "sqlite" || conf.Type == "sqlite3") && conf.MaxOpens == 0 {
|
||||
conf.MaxOpens = 100
|
||||
}
|
||||
if conf.MaxIdles > 0 {
|
||||
conn.SetMaxIdleConns(conf.MaxIdles)
|
||||
}
|
||||
@ -573,25 +504,6 @@ func getDB(name string, logger *log.Logger, useCache bool) *DB {
|
||||
if conf.LogSlow == 0 {
|
||||
conf.LogSlow = config.Duration(1000 * time.Millisecond)
|
||||
}
|
||||
|
||||
if conf.Type == "sqlite" || conf.Type == "sqlite3" {
|
||||
baseExecRaw(conn, nil, "PRAGMA journal_mode=WAL")
|
||||
baseExecRaw(conn, nil, "PRAGMA synchronous=NORMAL")
|
||||
baseExecRaw(conn, nil, "PRAGMA busy_timeout=5000")
|
||||
baseExecRaw(conn, nil, "PRAGMA temp_store=MEMORY")
|
||||
baseExecRaw(conn, nil, "PRAGMA cache_size=-2000")
|
||||
|
||||
// Dynamic mmap_size: 1/4 of system memory, max 30GB
|
||||
mmapLimit := int64(30000000000)
|
||||
sysMemStr := runShell("sysctl -n hw.memsize || free -b | awk '/Mem:/ {print $2}'")
|
||||
if sysMem := cast.Int64(sysMemStr); sysMem > 0 {
|
||||
if mmapLimit > sysMem/4 {
|
||||
mmapLimit = sysMem / 4
|
||||
}
|
||||
}
|
||||
baseExecRaw(conn, nil, fmt.Sprintf("PRAGMA mmap_size=%d", mmapLimit))
|
||||
}
|
||||
|
||||
if useCache {
|
||||
dbInstancesLock.Lock()
|
||||
dbInstances[name] = db
|
||||
@ -616,13 +528,6 @@ func getPoolForHost(conf *Config, host string) (*sql.DB, error) {
|
||||
if connector := connectors[conf.Type]; connector != nil {
|
||||
return sql.OpenDB(connector(conf, conf.pwd, conf.tls)), nil
|
||||
} else {
|
||||
if (conf.Type == "sqlite" || conf.Type == "sqlite3") && !strings.Contains(conf.Args, "journal_mode") {
|
||||
if conf.Args != "" {
|
||||
conf.Args += "&"
|
||||
}
|
||||
conf.Args += "_journal_mode=WAL&_busy_timeout=5000&_pragma=synchronous(1)&_pragma=cache_size(-2000)"
|
||||
}
|
||||
|
||||
dsn := ""
|
||||
args := make([]string, 0)
|
||||
if conf.SSL != "" {
|
||||
@ -656,7 +561,6 @@ func (db *DB) CopyByLogger(logger *log.Logger) *DB {
|
||||
newDB.Config = db.Config
|
||||
newDB.tables = db.tables
|
||||
newDB.tablesLock = db.tablesLock
|
||||
newDB.sqliteMu = db.sqliteMu
|
||||
if logger == nil {
|
||||
logger = log.DefaultLogger
|
||||
}
|
||||
@ -693,7 +597,6 @@ func (db *DB) GetOriginDB() *sql.DB {
|
||||
func (db *DB) Prepare(query string) *Stmt {
|
||||
stmt := basePrepare(db.conn, nil, query)
|
||||
stmt.logger = db.logger
|
||||
stmt.sqliteMu = db.sqliteMu
|
||||
if stmt.Error != nil {
|
||||
db.logger.LogError(stmt.Error.Error())
|
||||
}
|
||||
@ -710,22 +613,19 @@ func (db *DB) Quotes(texts []string) string {
|
||||
|
||||
func (db *DB) Begin() *Tx {
|
||||
if db.conn == nil {
|
||||
return &Tx{db: db, sqliteMu: db.sqliteMu, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), Error: errors.New("operate on a bad connection"), logger: db.logger}
|
||||
return &Tx{db: db, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), Error: errors.New("operate on a bad connection"), logger: db.logger}
|
||||
}
|
||||
sqlTx, err := db.conn.Begin()
|
||||
if err != nil {
|
||||
db.logger.LogError(err.Error())
|
||||
return &Tx{db: db, sqliteMu: db.sqliteMu, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), Error: err, logger: db.logger}
|
||||
return &Tx{db: db, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), Error: err, logger: db.logger}
|
||||
}
|
||||
return &Tx{db: db, sqliteMu: db.sqliteMu, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), conn: sqlTx, logger: db.logger}
|
||||
return &Tx{db: db, QuoteTag: db.QuoteTag, logSlow: db.Config.LogSlow.TimeDuration(), conn: sqlTx, logger: db.logger}
|
||||
}
|
||||
|
||||
func (db *DB) Exec(query string, args ...any) *ExecResult {
|
||||
query, args = db.rewriteFTS(query, args)
|
||||
args = flatArgs(args)
|
||||
db.lock()
|
||||
r := baseExecRaw(db.conn, nil, query, args...)
|
||||
db.unlock()
|
||||
r := baseExec(db.conn, nil, query, args...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, args, r.usedTime)
|
||||
@ -737,14 +637,20 @@ func (db *DB) Exec(query string, args ...any) *ExecResult {
|
||||
return r
|
||||
}
|
||||
|
||||
func (db *DB) rawExec(query string, args ...any) *ExecResult {
|
||||
return db.Exec(query, args...)
|
||||
}
|
||||
|
||||
func (db *DB) Query(query string, args ...any) *QueryResult {
|
||||
query, args = db.rewriteFTS(query, args)
|
||||
args = flatArgs(args)
|
||||
r := baseQueryRaw(db.conn, nil, query, args...)
|
||||
conn := db.conn
|
||||
if db.readonlyConnections != nil {
|
||||
connNum := len(db.readonlyConnections)
|
||||
if connNum == 1 {
|
||||
conn = db.readonlyConnections[0]
|
||||
} else {
|
||||
p := rand.Int(0, connNum-1)
|
||||
conn = db.readonlyConnections[p]
|
||||
}
|
||||
}
|
||||
|
||||
r := baseQuery(conn, nil, query, args...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, args, r.usedTime)
|
||||
@ -756,24 +662,6 @@ func (db *DB) Query(query string, args ...any) *QueryResult {
|
||||
return r
|
||||
}
|
||||
|
||||
func (db *DB) rawQuery(query string, args ...any) *QueryResult {
|
||||
return db.Query(query, args...)
|
||||
}
|
||||
|
||||
|
||||
func (db *DB) lock() {
|
||||
if db.sqliteMu != nil {
|
||||
db.sqliteMu.Lock()
|
||||
}
|
||||
}
|
||||
|
||||
func (db *DB) unlock() {
|
||||
if db.sqliteMu != nil {
|
||||
db.sqliteMu.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var identifierRegex = `(?:['"` + "`" + `][^'"` + "`" + `]+['"` + "`" + `]|[\w\-]+)`
|
||||
var likeFieldReg = regexp.MustCompile(`(?i)(` + identifierRegex + `(?:\.` + identifierRegex + `)*)\s+LIKE\s*$`)
|
||||
var likeLiteralReg = regexp.MustCompile(`(?i)(` + identifierRegex + `(?:\.` + identifierRegex + `)*)\s+LIKE\s+(['"])(%?[^'"]*?%?)(['"])`)
|
||||
@ -966,17 +854,44 @@ func (db *DB) extractTableName(query string, field string) string {
|
||||
|
||||
func (db *DB) Insert(table string, data any) *ExecResult {
|
||||
query, values := db.MakeInsertSql(table, data, false)
|
||||
return db.Exec(query, values...)
|
||||
r := baseExec(db.conn, nil, query, values...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, values, r.usedTime)
|
||||
} else {
|
||||
if db.Config.LogSlow > 0 && r.usedTime >= float32(db.Config.LogSlow.TimeDuration()/time.Millisecond) {
|
||||
db.logger.LogQuery(query, values, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (db *DB) Replace(table string, data any) *ExecResult {
|
||||
query, values := db.MakeInsertSql(table, data, true)
|
||||
return db.Exec(query, values...)
|
||||
r := baseExec(db.conn, nil, query, values...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, values, r.usedTime)
|
||||
} else {
|
||||
if db.Config.LogSlow > 0 && r.usedTime >= float32(db.Config.LogSlow.TimeDuration()/time.Millisecond) {
|
||||
db.logger.LogQuery(query, values, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (db *DB) Update(table string, data any, conditions string, args ...any) *ExecResult {
|
||||
query, values := db.MakeUpdateSql(table, data, conditions, args...)
|
||||
return db.Exec(query, values...)
|
||||
r := baseExec(db.conn, nil, query, values...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, values, r.usedTime)
|
||||
} else {
|
||||
if db.Config.LogSlow > 0 && r.usedTime >= float32(db.Config.LogSlow.TimeDuration()/time.Millisecond) {
|
||||
db.logger.LogQuery(query, values, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (db *DB) Delete(table string, conditions string, args ...any) *ExecResult {
|
||||
@ -986,7 +901,16 @@ func (db *DB) Delete(table string, conditions string, args ...any) *ExecResult {
|
||||
conditions = " where " + conditions
|
||||
}
|
||||
query := fmt.Sprintf("delete from %s%s", db.Quote(table), conditions)
|
||||
return db.Exec(query, args...)
|
||||
r := baseExec(db.conn, nil, query, args...)
|
||||
r.logger = db.logger
|
||||
if r.Error != nil {
|
||||
db.logger.LogQueryError(r.Error.Error(), query, args, r.usedTime)
|
||||
} else {
|
||||
if db.Config.LogSlow > 0 && r.usedTime >= float32(db.Config.LogSlow.TimeDuration()/time.Millisecond) {
|
||||
db.logger.LogQuery(query, args, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
// Shadow delete
|
||||
@ -1020,7 +944,7 @@ func (db *DB) getTable(table string) *TableStruct {
|
||||
var query string
|
||||
if db.Config.Type == "mysql" {
|
||||
query = "SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, COLUMN_KEY FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?"
|
||||
res := db.rawQuery(query, db.Config.DB, table)
|
||||
res := db.Query(query, db.Config.DB, table)
|
||||
rows := res.MapResults()
|
||||
for _, row := range rows {
|
||||
col := cast.String(row["COLUMN_NAME"])
|
||||
@ -1039,7 +963,7 @@ func (db *DB) getTable(table string) *TableStruct {
|
||||
}
|
||||
} else if db.Config.Type == "postgres" || db.Config.Type == "pgx" {
|
||||
query = "SELECT column_name, data_type, character_maximum_length FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = ?"
|
||||
res := db.rawQuery(query, table)
|
||||
res := db.Query(query, table)
|
||||
rows := res.MapResults()
|
||||
for _, row := range rows {
|
||||
col := cast.String(row["column_name"])
|
||||
@ -1059,8 +983,8 @@ func (db *DB) getTable(table string) *TableStruct {
|
||||
}
|
||||
} else if isFileDB(db.Config.Type) {
|
||||
// For SQLite
|
||||
query := fmt.Sprintf("PRAGMA table_info(%s)", db.Quote(table))
|
||||
res := db.rawQuery(query)
|
||||
query = fmt.Sprintf("PRAGMA table_info(%s)", db.Quote(table))
|
||||
res := db.Query(query)
|
||||
rows := res.MapResults()
|
||||
for _, row := range rows {
|
||||
colName := cast.String(row["name"])
|
||||
@ -1091,19 +1015,19 @@ func (db *DB) getTable(table string) *TableStruct {
|
||||
shadowTable := table + "_deleted"
|
||||
if db.Config.Type == "mysql" {
|
||||
query = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?"
|
||||
res := db.rawQuery(query, db.Config.DB, shadowTable)
|
||||
res := db.Query(query, db.Config.DB, shadowTable)
|
||||
if res.StringOnR1C1() != "" {
|
||||
ts.HasShadowTable = true
|
||||
}
|
||||
} else if db.Config.Type == "postgres" || db.Config.Type == "pgx" {
|
||||
query = "SELECT table_name FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = ?"
|
||||
res := db.rawQuery(query, shadowTable)
|
||||
res := db.Query(query, shadowTable)
|
||||
if res.StringOnR1C1() != "" {
|
||||
ts.HasShadowTable = true
|
||||
}
|
||||
} else if isFileDB(db.Config.Type) {
|
||||
query = "SELECT name FROM sqlite_master WHERE type='table' AND name=?"
|
||||
res := db.rawQuery(query, shadowTable)
|
||||
res := db.Query(query, shadowTable)
|
||||
if res.StringOnR1C1() != "" {
|
||||
ts.HasShadowTable = true
|
||||
}
|
||||
|
||||
10
Log.go
10
Log.go
@ -6,11 +6,11 @@ import (
|
||||
)
|
||||
|
||||
type DBLog struct {
|
||||
DbType string `log:"pos:7,color:blue"`
|
||||
Dsn string `log:"pos:8,color:gray,withoutkey:true"`
|
||||
Query string `log:"pos:9,color:cyan"`
|
||||
QueryArgs string `log:"pos:10,color:gray"`
|
||||
UsedTime float32 `log:"pos:11,format:%.2fms"`
|
||||
DbType string `log:"pos:6,color:blue"`
|
||||
Dsn string `log:"pos:7,color:gray,withoutkey:true"`
|
||||
Query string `log:"pos:8,color:cyan"`
|
||||
QueryArgs string `log:"pos:9,color:gray"`
|
||||
UsedTime float32 `log:"pos:10,format:%.2fms"`
|
||||
}
|
||||
|
||||
func (l *DBLog) Reset() {
|
||||
|
||||
29
Schema.go
29
Schema.go
@ -294,7 +294,7 @@ func (db *DB) Sync(desc string) error {
|
||||
for _, group := range groups {
|
||||
for _, table := range group.Tables {
|
||||
db.tablesLock.Lock()
|
||||
delete(db.tables, table.Name)
|
||||
db.tables[table.Name] = table
|
||||
db.tablesLock.Unlock()
|
||||
|
||||
err := db.CheckTable(table)
|
||||
@ -307,8 +307,6 @@ func (db *DB) Sync(desc string) error {
|
||||
return outErr
|
||||
}
|
||||
|
||||
|
||||
|
||||
// CheckTable 检查并同步单个表结构
|
||||
func (db *DB) CheckTable(table *TableStruct) error {
|
||||
fieldSets := make([]string, 0)
|
||||
@ -426,40 +424,34 @@ func (db *DB) CheckTable(table *TableStruct) error {
|
||||
tmpFields := []struct {
|
||||
Name string
|
||||
Type string
|
||||
Notnull int
|
||||
Notnull bool
|
||||
Dflt_value any
|
||||
Pk int
|
||||
Pk bool
|
||||
}{}
|
||||
if err := db.Query("PRAGMA table_info(" + db.Quote(table.Name) + ")").To(&tmpFields); err != nil {
|
||||
return err
|
||||
}
|
||||
db.Query("PRAGMA table_info(" + db.Quote(table.Name) + ")").To(&tmpFields)
|
||||
for _, f := range tmpFields {
|
||||
oldFieldList = append(oldFieldList, &tableFieldDesc{
|
||||
Field: f.Name,
|
||||
Type: f.Type,
|
||||
Null: cast.If(f.Notnull != 0, "NO", "YES"),
|
||||
Key: cast.If(f.Pk != 0, "PRI", ""),
|
||||
Null: cast.If(f.Notnull, "NO", "YES"),
|
||||
Key: cast.If(f.Pk, "PRI", ""),
|
||||
Default: cast.String(f.Dflt_value),
|
||||
})
|
||||
}
|
||||
tmpIndexes := []struct {
|
||||
Name string
|
||||
Unique int
|
||||
Unique bool
|
||||
Origin string
|
||||
Partial int
|
||||
}{}
|
||||
if err := db.Query("PRAGMA index_list(" + db.Quote(table.Name) + ")").To(&tmpIndexes); err != nil {
|
||||
return err
|
||||
}
|
||||
db.Query("PRAGMA index_list(" + db.Quote(table.Name) + ")").To(&tmpIndexes)
|
||||
for _, i := range tmpIndexes {
|
||||
tmpIndexInfo := []struct {
|
||||
Name string
|
||||
Seqno int
|
||||
Cid int
|
||||
}{}
|
||||
if err := db.Query("PRAGMA index_info(" + db.Quote(i.Name) + ")").To(&tmpIndexInfo); err != nil {
|
||||
return err
|
||||
}
|
||||
db.Query("PRAGMA index_info(" + db.Quote(i.Name) + ")").To(&tmpIndexInfo)
|
||||
if len(tmpIndexInfo) > 0 {
|
||||
oldIndexInfos = append(oldIndexInfos, &tableKeyDesc{
|
||||
Key_name: i.Name,
|
||||
@ -523,9 +515,6 @@ func (db *DB) CheckTable(table *TableStruct) error {
|
||||
for keyId := range oldIndexes {
|
||||
if keyId != "PRIMARY" && !isPostgres && strings.ToLower(keySetFields[keyId]) != strings.ToLower(oldIndexes[keyId]) {
|
||||
if strings.HasPrefix(db.Config.Type, "sqlite") {
|
||||
if strings.HasPrefix(keyId, "sqlite_autoindex_") {
|
||||
continue
|
||||
}
|
||||
actions = append(actions, "DROP INDEX "+db.Quote(keyId))
|
||||
} else {
|
||||
actions = append(actions, "DROP KEY "+db.Quote(keyId))
|
||||
|
||||
6
Stmt.go
6
Stmt.go
@ -3,13 +3,11 @@ package db
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Stmt struct {
|
||||
conn *sql.Stmt
|
||||
sqliteMu *sync.Mutex
|
||||
lastSql *string
|
||||
lastArgs []any
|
||||
Error error
|
||||
@ -17,10 +15,6 @@ type Stmt struct {
|
||||
}
|
||||
|
||||
func (stmt *Stmt) Exec(args ...any) *ExecResult {
|
||||
if stmt.sqliteMu != nil {
|
||||
stmt.sqliteMu.Lock()
|
||||
defer stmt.sqliteMu.Unlock()
|
||||
}
|
||||
stmt.lastArgs = args
|
||||
if stmt.conn == nil {
|
||||
return &ExecResult{Sql: stmt.lastSql, Args: stmt.lastArgs, usedTime: -1, logger: stmt.logger, Error: errors.New("operate on a bad connection")}
|
||||
|
||||
85
Tx.go
85
Tx.go
@ -5,15 +5,12 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Tx struct {
|
||||
conn *sql.Tx
|
||||
db *DB
|
||||
sqliteMu *sync.Mutex
|
||||
hasLock bool
|
||||
lastSql *string
|
||||
lastArgs []any
|
||||
Error error
|
||||
@ -32,7 +29,6 @@ func (tx *Tx) Quotes(texts []string) string {
|
||||
}
|
||||
|
||||
func (tx *Tx) Commit() error {
|
||||
defer tx.unlock()
|
||||
if tx.isCommittedOrRollbacked {
|
||||
return nil
|
||||
}
|
||||
@ -49,7 +45,6 @@ func (tx *Tx) Commit() error {
|
||||
}
|
||||
|
||||
func (tx *Tx) Rollback() error {
|
||||
defer tx.unlock()
|
||||
if tx.isCommittedOrRollbacked {
|
||||
return nil
|
||||
}
|
||||
@ -83,7 +78,6 @@ func (tx *Tx) CheckFinished() error {
|
||||
}
|
||||
|
||||
func (tx *Tx) Prepare(query string) *Stmt {
|
||||
tx.lock()
|
||||
tx.lastSql = &query
|
||||
r := basePrepare(nil, tx.conn, query)
|
||||
r.logger = tx.logger
|
||||
@ -95,11 +89,9 @@ func (tx *Tx) Prepare(query string) *Stmt {
|
||||
|
||||
func (tx *Tx) Exec(query string, args ...any) *ExecResult {
|
||||
query, args = tx.db.rewriteFTS(query, args)
|
||||
args = flatArgs(args)
|
||||
tx.lock()
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = args
|
||||
r := baseExecRaw(nil, tx.conn, query, args...)
|
||||
r := baseExec(nil, tx.conn, query, args...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
@ -113,11 +105,9 @@ func (tx *Tx) Exec(query string, args ...any) *ExecResult {
|
||||
|
||||
func (tx *Tx) Query(query string, args ...any) *QueryResult {
|
||||
query, args = tx.db.rewriteFTS(query, args)
|
||||
args = flatArgs(args)
|
||||
// Query in Tx doesn't acquire lock unless it's already held by a previous write
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = args
|
||||
r := baseQueryRaw(nil, tx.conn, query, args...)
|
||||
r := baseQuery(nil, tx.conn, query, args...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
@ -129,20 +119,52 @@ func (tx *Tx) Query(query string, args ...any) *QueryResult {
|
||||
return r
|
||||
}
|
||||
|
||||
|
||||
func (tx *Tx) Insert(table string, data any) *ExecResult {
|
||||
query, values := tx.MakeInsertSql(table, data, false)
|
||||
return tx.Exec(query, values...)
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = values
|
||||
r := baseExec(nil, tx.conn, query, values...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
} else {
|
||||
if tx.logSlow > 0 && r.usedTime >= float32(tx.logSlow/time.Millisecond) {
|
||||
tx.logger.LogQuery(*tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (tx *Tx) Replace(table string, data any) *ExecResult {
|
||||
query, values := tx.MakeInsertSql(table, data, true)
|
||||
return tx.Exec(query, values...)
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = values
|
||||
r := baseExec(nil, tx.conn, query, values...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
} else {
|
||||
if tx.logSlow > 0 && r.usedTime >= float32(tx.logSlow/time.Millisecond) {
|
||||
tx.logger.LogQuery(*tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (tx *Tx) Update(table string, data any, conditions string, args ...any) *ExecResult {
|
||||
query, values := tx.MakeUpdateSql(table, data, conditions, args...)
|
||||
return tx.Exec(query, values...)
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = values
|
||||
r := baseExec(nil, tx.conn, query, values...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
} else {
|
||||
if tx.logSlow > 0 && r.usedTime >= float32(tx.logSlow/time.Millisecond) {
|
||||
tx.logger.LogQuery(*tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (tx *Tx) Delete(table string, conditions string, args ...any) *ExecResult {
|
||||
@ -165,31 +187,24 @@ func (tx *Tx) Delete(table string, conditions string, args ...any) *ExecResult {
|
||||
colList = " select *"
|
||||
}
|
||||
moveQuery := fmt.Sprintf("insert into %s%s from %s%s", tx.Quote(table+"_deleted"), colList, tx.Quote(table), where)
|
||||
// Use Exec to handle locking
|
||||
r := tx.Exec(moveQuery, args...)
|
||||
r := baseExec(nil, tx.conn, moveQuery, args...)
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), moveQuery, args, r.usedTime)
|
||||
return r
|
||||
}
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("delete from %s%s", tx.Quote(table), where)
|
||||
return tx.Exec(query, args...)
|
||||
tx.lastSql = &query
|
||||
tx.lastArgs = args
|
||||
r := baseExec(nil, tx.conn, query, args...)
|
||||
r.logger = tx.logger
|
||||
if r.Error != nil {
|
||||
tx.logger.LogQueryError(r.Error.Error(), *tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
} else {
|
||||
if tx.logSlow > 0 && r.usedTime >= float32(tx.logSlow/time.Millisecond) {
|
||||
tx.logger.LogQuery(*tx.lastSql, tx.lastArgs, r.usedTime)
|
||||
}
|
||||
|
||||
func (tx *Tx) lock() {
|
||||
if tx.sqliteMu == nil || tx.hasLock {
|
||||
return
|
||||
}
|
||||
tx.sqliteMu.Lock()
|
||||
tx.hasLock = true
|
||||
return r
|
||||
}
|
||||
|
||||
func (tx *Tx) unlock() {
|
||||
if tx.sqliteMu == nil || !tx.hasLock {
|
||||
return
|
||||
}
|
||||
tx.sqliteMu.Unlock()
|
||||
tx.hasLock = false
|
||||
}
|
||||
|
||||
|
||||
|
||||
22
go.mod
22
go.mod
@ -3,15 +3,15 @@ module apigo.cc/go/db
|
||||
go 1.25.0
|
||||
|
||||
require (
|
||||
apigo.cc/go/cast v1.3.3
|
||||
apigo.cc/go/config v1.3.1
|
||||
apigo.cc/go/crypto v1.3.1
|
||||
apigo.cc/go/file v1.3.2
|
||||
apigo.cc/go/id v1.3.1
|
||||
apigo.cc/go/log v1.3.4
|
||||
apigo.cc/go/redis v1.3.2
|
||||
apigo.cc/go/safe v1.3.1
|
||||
apigo.cc/go/shell v1.3.1
|
||||
apigo.cc/go/cast v1.3.0
|
||||
apigo.cc/go/config v1.3.0
|
||||
apigo.cc/go/crypto v1.3.0
|
||||
apigo.cc/go/id v1.3.0
|
||||
apigo.cc/go/log v1.3.2
|
||||
apigo.cc/go/rand v1.3.0
|
||||
apigo.cc/go/redis v1.3.0
|
||||
apigo.cc/go/safe v1.3.0
|
||||
apigo.cc/go/shell v1.3.0
|
||||
github.com/go-sql-driver/mysql v1.10.0
|
||||
github.com/jackc/pgx/v5 v5.9.2
|
||||
github.com/mitchellh/mapstructure v1.5.0
|
||||
@ -19,8 +19,8 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
apigo.cc/go/encoding v1.3.1 // indirect
|
||||
apigo.cc/go/rand v1.3.1 // indirect
|
||||
apigo.cc/go/encoding v1.3.0 // indirect
|
||||
apigo.cc/go/file v1.3.0 // indirect
|
||||
filippo.io/edwards25519 v1.2.0 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/gomodule/redigo v2.0.0+incompatible // indirect
|
||||
|
||||
44
go.sum
44
go.sum
@ -1,25 +1,25 @@
|
||||
apigo.cc/go/cast v1.3.3 h1:aln5eDR5DZVWVzZ/y5SJh1gQNgWv2sT82I25NaO9g34=
|
||||
apigo.cc/go/cast v1.3.3/go.mod h1:lGlwImiOvHxG7buyMWhFzcdvQzmSaoKbmr7bcDfUpHk=
|
||||
apigo.cc/go/config v1.3.1 h1:wZzUh4oL+fGD6SayVgX6prLPMsniM25etWFcEH8XzIE=
|
||||
apigo.cc/go/config v1.3.1/go.mod h1:7KHz/1WmtBLM762Lln/TaXh2dmlMvJTLhnlk33zbS3U=
|
||||
apigo.cc/go/crypto v1.3.1 h1:ulQ2zX9bUWirk0sEacx1Srsjs2Jow7HlZq7ED7msNcg=
|
||||
apigo.cc/go/crypto v1.3.1/go.mod h1:SwHlBFDPddttWgFFtzsEMla8CM/rcFy9nvdsJjW4CIs=
|
||||
apigo.cc/go/encoding v1.3.1 h1:y8O58KYAyulkThg1O2ji2BqjnFoSvk42sit9I3z+K7Y=
|
||||
apigo.cc/go/encoding v1.3.1/go.mod h1:xAJk5b83VZ31mXMTnyp0dfMoBKfT/AHDn0u+cQfojgY=
|
||||
apigo.cc/go/file v1.3.2 h1:pu4oiDyiqgj3/eykfnJf+/6+A9v/Z0b3ClP5XK+lwG4=
|
||||
apigo.cc/go/file v1.3.2/go.mod h1:vci4h0Pz94mV6dkniQkuyBYERVYeq7/LX4jJVuCg9hs=
|
||||
apigo.cc/go/id v1.3.1 h1:pkqi6VeWyQoHuIu0Zbx/RRxIAdM61Js0j6cY1M9XVCk=
|
||||
apigo.cc/go/id v1.3.1/go.mod h1:P2/vl3tyW3US+ayOFSMoPIOCulNLBngNYPhXJC/Z7J4=
|
||||
apigo.cc/go/log v1.3.4 h1:UT8Neb9r4QjjbCFbTzw+ZeTxd+DmdmR5gNExeR4Cj+g=
|
||||
apigo.cc/go/log v1.3.4/go.mod h1:/Q/2r51xWSsrS4QN5U9jLiTw8n6qNC8kG9nuVHweY20=
|
||||
apigo.cc/go/rand v1.3.1 h1:7FvsI6PtQ5XrWER0dTiLVo0p7GIxRidT/TBKhVy93j8=
|
||||
apigo.cc/go/rand v1.3.1/go.mod h1:mZ/4Soa3bk+XvDaqPWJuUe1bfEi4eThBj1XmEAuYxsk=
|
||||
apigo.cc/go/redis v1.3.2 h1:iUWL/CHHnfonz0dJq6/V4IG3QuXBoHA2L1xnoGEbNEQ=
|
||||
apigo.cc/go/redis v1.3.2/go.mod h1:/k5wcfAzB9jrfd9otabio9CPUxEsLPgEs4oggBG5sbs=
|
||||
apigo.cc/go/safe v1.3.1 h1:irTCqPAC97gGsX/Lw5AzLelDt1xXLEZIAaVhLELWe9Q=
|
||||
apigo.cc/go/safe v1.3.1/go.mod h1:XdOpBhN2vkImalaykYXXmEpczqWa1y3ah6/Q72cdRqE=
|
||||
apigo.cc/go/shell v1.3.1 h1:M8oD0b2HcJuCC6frQFx11b3UTcTx3lATX8XK+YXSVm8=
|
||||
apigo.cc/go/shell v1.3.1/go.mod h1:ZMdJjpCpWdvsHKUXlelh/AxsV/nWdkH/k3lISfzMdUw=
|
||||
apigo.cc/go/cast v1.3.0 h1:ZTcLYijkqZjSWSCSpJUWMfzJYeJKbwKxquKkPrFsROQ=
|
||||
apigo.cc/go/cast v1.3.0/go.mod h1:lGlwImiOvHxG7buyMWhFzcdvQzmSaoKbmr7bcDfUpHk=
|
||||
apigo.cc/go/config v1.3.0 h1:TwI3bv3D+BJrAnFx+o62HQo3FarY2Ge3SCGsKchFYGg=
|
||||
apigo.cc/go/config v1.3.0/go.mod h1:88lqKEBXlIExFKt1geLONVLYyM+QhRVpBe0ok3OEvjI=
|
||||
apigo.cc/go/crypto v1.3.0 h1:rGRrrb5O+4M50X5hVUmJQbXx3l87zzlcgzGtUvZrZL8=
|
||||
apigo.cc/go/crypto v1.3.0/go.mod h1:uSCcmbcFoiltUPMQTSuqmU9nfKEH/lRs7nQ7aa3Z4Mc=
|
||||
apigo.cc/go/encoding v1.3.0 h1:8jqNHoZBR8vOU/BGsLFebfp1Txa1UxDRpd7YwzIFLJs=
|
||||
apigo.cc/go/encoding v1.3.0/go.mod h1:kT/uUJiuAOkZ4LzUWrUtk/I0iL1D8aatvD+59bDnHBo=
|
||||
apigo.cc/go/file v1.3.0 h1:xG9FcY3Rv6Br83r9pq9QsIXFrplx4g8ITOkHSzfzXRg=
|
||||
apigo.cc/go/file v1.3.0/go.mod h1:pYHBlB/XwsrnWpEh7GIFpbiqobrExfiB+rEN8V2d2kY=
|
||||
apigo.cc/go/id v1.3.0 h1:Tr2Yj0Rl19lfwW5wBTJ407o/zgo2oVRLE20WWEgJzdE=
|
||||
apigo.cc/go/id v1.3.0/go.mod h1:AFH3kMFwENfXNyijnAFWEhSF1o3y++UBPem1IUlrcxA=
|
||||
apigo.cc/go/log v1.3.2 h1:/m3V4MnlYnCG4XPHpWDsa4cw5suMaDVY1SgaVyjnBSo=
|
||||
apigo.cc/go/log v1.3.2/go.mod h1:dz4bSz9BnOgutkUJJZfX3uDDwsMpUxt7WF50mLK9hgE=
|
||||
apigo.cc/go/rand v1.3.0 h1:k+UFAhMySwXf+dq8Om9TniZV6fm6gAE0evbrqMEdwQU=
|
||||
apigo.cc/go/rand v1.3.0/go.mod h1:mZ/4Soa3bk+XvDaqPWJuUe1bfEi4eThBj1XmEAuYxsk=
|
||||
apigo.cc/go/redis v1.3.0 h1:3NJE3xPXzhCwL+Mh1iyphFrsKWEuPlY26LHJfMVFSeU=
|
||||
apigo.cc/go/redis v1.3.0/go.mod h1:KPDPwMOER7WJX3Qev24LTeAOSmCl8OApe8iagPDxOUQ=
|
||||
apigo.cc/go/safe v1.3.0 h1:uctdAUsphT9p60Tk4oS5xPCe0NoIdOHfsYv4PNS0Rok=
|
||||
apigo.cc/go/safe v1.3.0/go.mod h1:tC9X14V+qh0BqIrVg4UkXbl+2pEN+lj2ZNI8IjDB6Fs=
|
||||
apigo.cc/go/shell v1.3.0 h1:hdxuYPN/7T2BuM/Ja8AjVUhbRqU/wpi8OjcJVziJ0nw=
|
||||
apigo.cc/go/shell v1.3.0/go.mod h1:aNJiRWibxlA485yX3t+07IVAbrALKmxzv4oGEUC+hK4=
|
||||
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
|
||||
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user