some renaming of packages; work in progress / just started: storage/tracking

examples/demo/etc/etc.go

@@ -7,8 +7,8 @@ import (
 	"git.sr.ht/~cco/go-scopes/core/action"
 	"git.sr.ht/~cco/go-scopes/logging"
 	"git.sr.ht/~cco/go-scopes/server"
+	sql "git.sr.ht/~cco/go-scopes/storage"
 	msgstore "git.sr.ht/~cco/go-scopes/storage/message"
-	"git.sr.ht/~cco/go-scopes/storage/sql"
 )
 
 func Config() lib.Config {

examples/demo/main.go

@@ -4,7 +4,7 @@ import (
 	"demo/etc"
 
 	"git.sr.ht/~cco/go-scopes/app"
-	_ "git.sr.ht/~cco/go-scopes/storage/sql/pgsql"
+	_ "git.sr.ht/~cco/go-scopes/storage/db/pgsql"
 )
 
 func main() {

storage/message/message.go

@@ -2,7 +2,7 @@ package message
 
 import (
 	lib "git.sr.ht/~cco/go-scopes"
-	"git.sr.ht/~cco/go-scopes/storage/sql"
+	sql "git.sr.ht/~cco/go-scopes/storage"
 )
 
 func Store(act lib.Action) bool {

storage/storage.go

@@ -1,4 +1,4 @@
-package sql
+package storage
 
 import (
 	"database/sql"
@@ -167,5 +167,5 @@ func (db *Storage) logErr(err error, info, inp string) error {
 }
 
 const (
-	sql_drop = `drop table %s`
+	sql_drop = `drop table if exists %s`
 )

storage/tracking/sql_code.go

@@ -0,0 +1,15 @@
+package tracking
+
+const sql_table = `
+create table {{ .tablename }} (
+  trackid {{ .idType }} primary key,
+  {{- range .headFields -}}{{ . }} text,
+  {{ end -}}
+  timestamp timestamptz default current_timestamp,
+  data {{ .jsonType -}}
+);
+
+{{ range $i, $cols := .indexes }}
+create index idx_{{ .i }} on {{ .tablename }} ({{ .cols }});
+{{- end }}
+create index idx_timestamp on {{ .tablename }} (timestamp);`

storage/tracking/tracking.go

@@ -0,0 +1,15 @@
+// Package `tracking` defines a generic track (sort of record) type
+// and a container type that allows storing of tracks in a SQL database.
+package tracking
+
+import (
+	"time"
+
+	lib "git.sr.ht/~cco/go-scopes"
+)
+
+type Track struct {
+	head      map[string]string
+	timestamp *time.Time
+	data      lib.Payload
+}

tests/etc/etc_sql.go

@@ -2,7 +2,7 @@ package etc
 
 import (
 	"git.sr.ht/~cco/go-scopes/config"
-	"git.sr.ht/~cco/go-scopes/storage/sql"
+	sql "git.sr.ht/~cco/go-scopes/storage"
 )
 
 func ConfigSqlite() *sql.Cfg {

tests/storage_test.go

@@ -5,10 +5,10 @@ import (
 
 	"git.sr.ht/~cco/go-scopes/common/testing"
 	"git.sr.ht/~cco/go-scopes/core/message"
+	sql "git.sr.ht/~cco/go-scopes/storage"
+	_ "git.sr.ht/~cco/go-scopes/storage/db/pgsql"
+	_ "git.sr.ht/~cco/go-scopes/storage/db/sqlite"
 	msgstore "git.sr.ht/~cco/go-scopes/storage/message"
-	"git.sr.ht/~cco/go-scopes/storage/sql"
-	_ "git.sr.ht/~cco/go-scopes/storage/sql/pgsql"
-	_ "git.sr.ht/~cco/go-scopes/storage/sql/sqlite"
 	"git.sr.ht/~cco/go-scopes/tests/etc"
 )