cco/go-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor code improvements, delete obsolete code

Browse source
This commit is contained in:
Helmut Merz 2024-04-14 09:16:13 +02:00
parent 872a692d88
commit 18a1906967
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
storage/storage.go
View file

@ -4,7 +4,6 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"os" "os"
"text/template"
lib "git.sr.ht/~cco/go-scopes" lib "git.sr.ht/~cco/go-scopes"
"git.sr.ht/~cco/go-scopes/logging/log" "git.sr.ht/~cco/go-scopes/logging/log"
@ -108,7 +107,7 @@ func (db *Storage) Query(process rowsProc, q string, args ...interface{}) error
} }
func (db *Storage) Exec(q string, args ...interface{}) (int64, error) { func (db *Storage) Exec(q string, args ...interface{}) (int64, error) {
info := "sql.Storage.Exec" info := "storage.Exec"
//log.Debug().Str("query", q).Msg(info) //log.Debug().Str("query", q).Msg(info)
res, err := db.DB.Exec(q, args...) res, err := db.DB.Exec(q, args...)
if err != nil { if err != nil {
@ -120,9 +119,7 @@ func (db *Storage) Exec(q string, args ...interface{}) (int64, error) {
} }
func (db *Storage) DropTable(tn string) error { func (db *Storage) DropTable(tn string) error {
//if db.Schema != "" { sql_drop := `drop table if exists %s`
// tn = fmt.Sprintf("%s.%s", db.Schema, tn)
//}
_, err := db.Exec(fmt.Sprintf(sql_drop, tn)) _, err := db.Exec(fmt.Sprintf(sql_drop, tn))
return err return err
} }
@ -136,21 +133,8 @@ func (db *Storage) RunScript(path string) error {
return err return err
} }
func (db *Storage) ParseTemplate(q string) *template.Template {
t, err := template.New("sql").Parse(q)
if err != nil {
db.LogErr(err, "storage.ParseTemplate", q)
return nil
}
return t
}
func (db *Storage) LogErr(err error, info, inp string) error { func (db *Storage) LogErr(err error, info, inp string) error {
log.Error(err).Str("input", inp).Msg(info) log.Error(err).Str("input", inp).Msg(info)
db.Errors = append(db.Errors, err) db.Errors = append(db.Errors, err)
return err return err
} }
const (
sql_drop = `drop table if exists %s`
)

3
storage/template.go
View file

@ -10,7 +10,6 @@ import (
var TemplateFunctions = map[string]any{ var TemplateFunctions = map[string]any{
"toLower": strings.ToLower, "toLower": strings.ToLower,
"add1": func(i int) int { return i + 1 }, "add1": func(i int) int { return i + 1 },
"add2": func(i int) int { return i + 2 },
"add": func(i, j int) int { return i + j }, "add": func(i, j int) int { return i + j },
} }
@ -27,7 +26,7 @@ func BuildSql(t *template.Template, data any) string {
var out strings.Builder var out strings.Builder
err := t.Execute(&out, data) err := t.Execute(&out, data)
if err != nil { if err != nil {
log.Error(err).Msg("storage.template.BuildSql") log.Error(err).Msg("storage|template.BuildSql")
return "" return ""
} }
return out.String() return out.String()