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

Container.Insert(): simplifications, use querySpec

Browse source
This commit is contained in:
Helmut Merz 2024-04-13 14:01:20 +02:00
parent ac84a0d4d9
commit 572f1bf80d
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/tracking/sql_code.go
View file

@ -29,13 +29,12 @@ create index idx_{{ $.tablename }}_ts on {{ $tablename }} (timestamp);
` `
sql_insert = ` sql_insert = `
{{- $tablename := or (and .schema (printf "%s.%s" .schema .tablename)) .tablename -}} insert into {{ .Table }} (
insert into {{ $tablename }} ( {{- range $j, $c := .Scols -}}
{{- range $j, $c := .columns -}}
{{- if ne $j 0 -}}, {{ end }}{{ toLower $c }} {{- if ne $j 0 -}}, {{ end }}{{ toLower $c }}
{{- end -}}) {{- end -}})
values ( values (
{{- range $j, $c := .columns -}} {{- range $j, $c := .Scols -}}
{{- if ne $j 0 -}}, {{ end }}${{ add1 $j }} {{- if ne $j 0 -}}, {{ end }}${{ add1 $j }}
{{- end -}}) {{- end -}})
returning trackid, timestamp` returning trackid, timestamp`

35
storage/tracking/tracking.go
View file

@ -189,7 +189,7 @@ func (cont *Container) Query(quSpec *querySpec) []*Track {
func (cont *Container) NewTrack(h []string, data lib.Map) *Track { func (cont *Container) NewTrack(h []string, data lib.Map) *Track {
tr := cont.ItemFactory(cont, h...) tr := cont.ItemFactory(cont, h...)
//tr.SetData(data) tr.Data = data
cont.Insert(tr) cont.Insert(tr)
return tr return tr
} }
@ -199,47 +199,36 @@ func (cont *Container) Save(t *Track) lib.Ident {
} }
func (cont *Container) Insert(tr *Track) lib.Ident { func (cont *Container) Insert(tr *Track) lib.Ident {
var columns []string db := cont.Storage
quSpec := &querySpec{
Scols: append(cont.HeadFields, "Data"),
}
quSpec.setup(cont)
sql := storage.BuildSql(SqlInsert, quSpec)
var values []any var values []any
for _, k := range cont.HeadFields { for _, k := range cont.HeadFields {
columns = append(columns, k)
values = append(values, tr.Head[k]) values = append(values, tr.Head[k])
} }
columns = append(columns, "Data")
b, _ := json.Marshal(tr.Data) b, _ := json.Marshal(tr.Data)
values = append(values, b) values = append(values, b)
db := cont.Storage
data := lib.Map{
"schema": db.Schema,
"tablename": cont.TableName,
"columns": columns,
}
sql := storage.BuildSql(SqlInsert, data)
var trid lib.Ident
var ts *time.Time
var tsstr string var tsstr string
proc := func(r *sqllib.Rows) error { proc := func(r *sqllib.Rows) error {
err := r.Scan(&trid, &ts) err := r.Scan(&tr.trackId, &tsstr)
if err != nil { tr.TimeStamp = ParseDateTime(tsstr)
err = r.Scan(&trid, &tsstr)
ts = ParseDateTime(tsstr)
}
return err return err
} }
if err := db.Query(proc, sql, values...); err == nil { if err := db.Query(proc, sql, values...); err == nil {
tr.trackId = trid return tr.trackId
tr.TimeStamp = ts
return trid
} }
return 0 return 0
} }
func ParseDateTime(inp string) *time.Time { func ParseDateTime(inp string) *time.Time {
ts, err := time.Parse("2006-01-02 15:04:05", inp) ts, err := time.Parse("2006-01-02T15:04:05-07:00", inp)
if err == nil { if err == nil {
return &ts return &ts
} }
ts, err = time.Parse("2006-01-02T15:04:05-07:00", inp) ts, err = time.Parse("2006-01-02 15:04:05", inp)
if err == nil { if err == nil {
return &ts return &ts
} }