diff --git a/storage/storage.go b/storage/storage.go index a0eb017..c1b6f04 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -4,7 +4,6 @@ import ( "database/sql" "fmt" "os" - "text/template" lib "git.sr.ht/~cco/go-scopes" "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) { - info := "sql.Storage.Exec" + info := "storage.Exec" //log.Debug().Str("query", q).Msg(info) res, err := db.DB.Exec(q, args...) if err != nil { @@ -120,9 +119,7 @@ func (db *Storage) Exec(q string, args ...interface{}) (int64, error) { } func (db *Storage) DropTable(tn string) error { - //if db.Schema != "" { - // tn = fmt.Sprintf("%s.%s", db.Schema, tn) - //} + sql_drop := `drop table if exists %s` _, err := db.Exec(fmt.Sprintf(sql_drop, tn)) return err } @@ -136,21 +133,8 @@ func (db *Storage) RunScript(path string) error { 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 { log.Error(err).Str("input", inp).Msg(info) db.Errors = append(db.Errors, err) return err } - -const ( - sql_drop = `drop table if exists %s` -) diff --git a/storage/template.go b/storage/template.go index afd7d4b..c6c2828 100644 --- a/storage/template.go +++ b/storage/template.go @@ -10,7 +10,6 @@ import ( var TemplateFunctions = map[string]any{ "toLower": strings.ToLower, "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 }, } @@ -27,7 +26,7 @@ func BuildSql(t *template.Template, data any) string { var out strings.Builder err := t.Execute(&out, data) if err != nil { - log.Error(err).Msg("storage.template.BuildSql") + log.Error(err).Msg("storage|template.BuildSql") return "" } return out.String()