POST:/users works

server/db/database.go

@@ -8,43 +8,60 @@ import (
 	"errors"
 	"fmt"
 	_ "github.com/mattn/go-sqlite3"
+	"time"
 )
 
-//go:embed schema_1.0.sql
+//go:embed schema_1.0.ddl
 var schema_1_0 string
 
-//go:embed schema_2.0.sql
+//go:embed schema_2.0.ddl
 var schema_2_0 string
 
-func NewDatabase(ctx context.Context, conf scn.Config) (*sql.DB, error) {
+//go:embed schema_3.0.ddl
+var schema_3_0 string
+
+type Database struct {
+	db *sql.DB
+}
+
+func NewDatabase(conf scn.Config) (*Database, error) {
 	db, err := sql.Open("sqlite3", conf.DBFile)
 	if err != nil {
 		return nil, err
 	}
 
-	schema, err := getSchemaFromDB(ctx, db)
+	return &Database{db}, nil
+}
+
+func (db *Database) Migrate(ctx context.Context) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 24*time.Second)
+	defer cancel()
+
+	schema, err := db.ReadSchema(ctx)
 	if schema == 0 {
 
-		_, err = db.ExecContext(ctx, schema_1_0)
+		_, err = db.db.ExecContext(ctx, schema_3_0)
 		if err != nil {
-			return nil, err
+			return err
 		}
 
-		return db, nil
+		return nil
 
 	} else if schema == 1 {
-		return nil, errors.New("cannot autom. upgrade schema 1")
+		return errors.New("cannot autom. upgrade schema 1")
 	} else if schema == 2 {
-		return db, nil
+		return errors.New("cannot autom. upgrade schema 2") //TODO
+	} else if schema == 3 {
+		return nil // current
 	} else {
-		return nil, errors.New(fmt.Sprintf("Unknown DB schema: %d", schema))
+		return errors.New(fmt.Sprintf("Unknown DB schema: %d", schema))
 	}
 
 }
 
-func getSchemaFromDB(ctx context.Context, db *sql.DB) (int, error) {
+func (db *Database) ReadSchema(ctx context.Context) (int, error) {
 
-	r1, err := db.QueryContext(ctx, "SELECT name FROM sqlite_master WHERE type='table' AND name='meta'")
+	r1, err := db.db.QueryContext(ctx, "SELECT name FROM sqlite_master WHERE type='table' AND name='meta'")
 	if err != nil {
 		return 0, err
 	}
@@ -53,7 +70,7 @@ func getSchemaFromDB(ctx context.Context, db *sql.DB) (int, error) {
 		return 0, nil
 	}
 
-	r2, err := db.QueryContext(ctx, "SELECT value_int FROM meta WHERE key='schema'")
+	r2, err := db.db.QueryContext(ctx, "SELECT value_int FROM meta WHERE meta_key='schema'")
 	if err != nil {
 		return 0, err
 	}
@@ -69,3 +86,11 @@ func getSchemaFromDB(ctx context.Context, db *sql.DB) (int, error) {
 
 	return schema, nil
 }
+
+func (db *Database) Ping() error {
+	return db.db.Ping()
+}
+
+func (db *Database) BeginTx(ctx context.Context) (*sql.Tx, error) {
+	return db.db.BeginTx(ctx, nil)
+}