migrate to multiple sqlite db files ( primary + requests + logs )

scnserver/db/database.go

@@ -1,110 +1,27 @@
 package db
 
 import (
-	server "blackforestbytes.com/simplecloudnotifier"
-	"blackforestbytes.com/simplecloudnotifier/db/dbtools"
-	"blackforestbytes.com/simplecloudnotifier/db/schema"
 	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"github.com/jmoiron/sqlx"
-	_ "github.com/mattn/go-sqlite3"
-	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
-	"time"
 )
 
-type Database struct {
-	db sq.DB
-	pp *dbtools.DBPreprocessor
-}
+type DatabaseImpl interface {
+	Migrate(ctx context.Context) error
+	Ping(ctx context.Context) error
+	BeginTx(ctx context.Context) (sq.Tx, error)
+	Stop(ctx context.Context) error
 
-func NewDatabase(conf server.Config) (*Database, error) {
-	url := fmt.Sprintf("file:%s?_journal=%s&_timeout=%d&_fk=%s", conf.DBFile, conf.DBJournal, conf.DBTimeout.Milliseconds(), langext.FormatBool(conf.DBCheckForeignKeys, "true", "false"))
+	ReadSchema(ctx context.Context) (int, error)
 
-	xdb, err := sqlx.Open("sqlite3", url)
-	if err != nil {
-		return nil, err
-	}
+	WriteMetaString(ctx context.Context, key string, value string) error
+	WriteMetaInt(ctx context.Context, key string, value int64) error
+	WriteMetaReal(ctx context.Context, key string, value float64) error
+	WriteMetaBlob(ctx context.Context, key string, value []byte) error
 
-	if conf.DBSingleConn {
-		xdb.SetMaxOpenConns(1)
-	} else {
-		xdb.SetMaxOpenConns(5)
-		xdb.SetMaxIdleConns(5)
-		xdb.SetConnMaxLifetime(60 * time.Minute)
-		xdb.SetConnMaxIdleTime(60 * time.Minute)
-	}
+	ReadMetaString(ctx context.Context, key string) (*string, error)
+	ReadMetaInt(ctx context.Context, key string) (*int64, error)
+	ReadMetaReal(ctx context.Context, key string) (*float64, error)
+	ReadMetaBlob(ctx context.Context, key string) (*[]byte, error)
 
-	qqdb := sq.NewDB(xdb)
-
-	qqdb.AddListener(dbtools.DBLogger{})
-
-	pp, err := dbtools.NewDBPreprocessor(qqdb)
-	if err != nil {
-		return nil, err
-	}
-
-	qqdb.AddListener(pp)
-
-	scndb := &Database{db: qqdb, pp: pp}
-
-	return scndb, nil
-}
-
-func (db *Database) Migrate(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 24*time.Second)
-	defer cancel()
-
-	currschema, err := db.ReadSchema(ctx)
-	if currschema == 0 {
-
-		_, err = db.db.Exec(ctx, schema.Schema3, sq.PP{})
-		if err != nil {
-			return err
-		}
-
-		err = db.WriteMetaInt(ctx, "schema", 3)
-		if err != nil {
-			return err
-		}
-
-		err = db.pp.Init(ctx)
-		if err != nil {
-			return err
-		}
-
-		return nil
-
-	} else if currschema == 1 {
-		return errors.New("cannot autom. upgrade schema 1")
-	} else if currschema == 2 {
-		return errors.New("cannot autom. upgrade schema 2") //TODO
-	} else if currschema == 3 {
-		return nil // current
-	} else {
-		return errors.New(fmt.Sprintf("Unknown DB schema: %d", currschema))
-	}
-
-}
-
-func (db *Database) Ping(ctx context.Context) error {
-	return db.db.Ping(ctx)
-}
-
-func (db *Database) BeginTx(ctx context.Context) (sq.Tx, error) {
-	return db.db.BeginTransaction(ctx, sql.LevelDefault)
-}
-
-func (db *Database) Stop(ctx context.Context) error {
-	_, err := db.db.Exec(ctx, "PRAGMA wal_checkpoint;", sq.PP{})
-	if err != nil {
-		return err
-	}
-	err = db.db.Exit()
-	if err != nil {
-		return err
-	}
-	return nil
+	DeleteMeta(ctx context.Context, key string) error
 }