adopt sqimple from scaffold

This commit is contained in:
2026-09-01 01:30:49 +01:00
parent 17ce3314f5
commit da0885db92
3 changed files with 7 additions and 19 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ go 1.25.7
require (
code.aneur.in/go/record v0.0.0-20260704022026-db3f74ccdeb4
code.aneur.in/go/rest v0.0.0-20260710144250-d3e2b415e4ac
code.aneur.in/go/sqaffold v0.0.0-20260831231301-efa486fea8fa
code.aneur.in/go/sqaffold v0.0.0-20260901002927-0d73340982a0
code.aneur.in/go/sqan v0.0.0-20260831231908-19f540e808b6
code.aneur.in/go/sqimple v0.0.0-20260710160754-2a04163d6eff
code.aneur.in/go/validate v0.0.0-20260705223845-8fab67ff77fe
+2 -2
View File
@@ -2,8 +2,8 @@ code.aneur.in/go/record v0.0.0-20260704022026-db3f74ccdeb4 h1:cE8tCjhHePkEMBEQbk
code.aneur.in/go/record v0.0.0-20260704022026-db3f74ccdeb4/go.mod h1:nIqf1d1YWOPSVrbBFJY2ZBEMMFSfQCgXL7nFVXOzVqo=
code.aneur.in/go/rest v0.0.0-20260710144250-d3e2b415e4ac h1:rmdYhq+CsQzPqK/tQ6G/DtWIS+IIME47Draei/mR9BM=
code.aneur.in/go/rest v0.0.0-20260710144250-d3e2b415e4ac/go.mod h1:HtXodmPBkxQyYkXn4UHURJEs44a+Jm+4tUaKXj246uE=
code.aneur.in/go/sqaffold v0.0.0-20260831231301-efa486fea8fa h1:97WLloin1C/OOPQYyyALij+Prsa82gxw0kBvkDnEIb8=
code.aneur.in/go/sqaffold v0.0.0-20260831231301-efa486fea8fa/go.mod h1:a3LqC1+uDSP2adLySuBEQmk/t2HJ+BNmIVMF+eSdC5s=
code.aneur.in/go/sqaffold v0.0.0-20260901002927-0d73340982a0 h1:WzuDzWiq8A/9VR7jRT8m58H7sn1BpW79+L+KygN4QWE=
code.aneur.in/go/sqaffold v0.0.0-20260901002927-0d73340982a0/go.mod h1:00LMGxPUE9cMpMzW/M2DZ6FNTVpn7Eh1jak2mgfI08g=
code.aneur.in/go/sqan v0.0.0-20260831231908-19f540e808b6 h1:zuxg66WgJpxH0dHemFJasJ2i82jnSxL8c3FJdOwQInA=
code.aneur.in/go/sqan v0.0.0-20260831231908-19f540e808b6/go.mod h1:0o6TJqTFx7qPLHiUtUxeN2cLR/xylxtJZyghXamEfy4=
code.aneur.in/go/sqimple v0.0.0-20260710160754-2a04163d6eff h1:DAZPseBNreEYH4XQG087NfQ+PpHIlpYVThRXKmRkupc=
+4 -16
View File
@@ -19,7 +19,7 @@ type DB struct {
}
func (db *DB) Delete(from string) *sqimple.DeleteStatement {
return sqimple.Delete(from).ExecFunc(db.sqimpleExec)
return db.scaffold.Delete(from)
}
func (db *DB) Exec(query string, args ...any) (sql.Result, error) {
@@ -27,7 +27,7 @@ func (db *DB) Exec(query string, args ...any) (sql.Result, error) {
}
func (db *DB) Insert(into string) *sqimple.InsertStatement {
return sqimple.Insert(into).ExecFunc(db.sqimpleExec)
return db.scaffold.Insert(into)
}
func (db *DB) Migrate() error {
@@ -43,23 +43,11 @@ func (db *DB) QueryOne(query string, args ...any) (record.Record, error) {
}
func (db *DB) Select(from string) *sqimple.SelectQuery {
return sqimple.Select(from).QueryFunc(db.sqimpleQuery).QueryRowFunc(db.sqimpleQueryRow)
return db.scaffold.Select(from)
}
func (db *DB) Update(table string) *sqimple.UpdateStatement {
return sqimple.Update(table).ExecFunc(db.sqimpleExec)
}
func (db *DB) sqimpleExec(query sqimple.Query) (sql.Result, error) {
return db.Exec(query.String(), query.Args()...)
}
func (db *DB) sqimpleQuery(query sqimple.Query) (*sql.Rows, error) {
return db.conn.QueryContext(db.ctx, query.String(), query.Args()...)
}
func (db *DB) sqimpleQueryRow(query sqimple.Query) *sql.Row {
return db.conn.QueryRowContext(db.ctx, query.String(), query.Args()...)
return db.scaffold.Update(table)
}
func New(ctx context.Context, log zerolog.Logger, conn *sql.DB) *DB {