CreateUser test

server/db/database.go

@@ -35,6 +35,11 @@ func (db *Database) Migrate(ctx context.Context) error {
 			return err
 		}
 
+		err = db.WriteMetaInt(ctx, "schema", 3)
+		if err != nil {
+			return err
+		}
+
 		return nil
 
 	} else if currschema == 1 {
@@ -49,34 +54,6 @@ func (db *Database) Migrate(ctx context.Context) error {
 
 }
 
-func (db *Database) ReadSchema(ctx context.Context) (int, error) {
-
-	r1, err := db.db.QueryContext(ctx, "SELECT name FROM sqlite_master WHERE type='table' AND name='meta'")
-	if err != nil {
-		return 0, err
-	}
-
-	if !r1.Next() {
-		return 0, nil
-	}
-
-	r2, err := db.db.QueryContext(ctx, "SELECT value_int FROM meta WHERE meta_key='schema'")
-	if err != nil {
-		return 0, err
-	}
-	if !r2.Next() {
-		return 0, errors.New("no schema entry in meta table")
-	}
-
-	var dbschema int
-	err = r2.Scan(&dbschema)
-	if err != nil {
-		return 0, err
-	}
-
-	return dbschema, nil
-}
-
 func (db *Database) Ping() error {
 	return db.db.Ping()
 }

server/db/meta.go

@@ -0,0 +1,159 @@
+package db
+
+import (
+	"context"
+	"errors"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+)
+
+func (db *Database) ReadSchema(ctx context.Context) (int, error) {
+
+	r1, err := db.db.QueryContext(ctx, "SELECT name FROM sqlite_master WHERE type='table' AND name='meta'")
+	if err != nil {
+		return 0, err
+	}
+
+	if !r1.Next() {
+		return 0, nil
+	}
+
+	r2, err := db.db.QueryContext(ctx, "SELECT value_int FROM meta WHERE meta_key='schema'")
+	if err != nil {
+		return 0, err
+	}
+	if !r2.Next() {
+		return 0, errors.New("no schema entry in meta table")
+	}
+
+	var dbschema int
+	err = r2.Scan(&dbschema)
+	if err != nil {
+		return 0, err
+	}
+
+	return dbschema, nil
+}
+
+func (db *Database) WriteMetaString(ctx context.Context, key string, value string) error {
+	_, err := db.db.ExecContext(ctx, "INSERT INTO meta (meta_key, value_txt) VALUES (?, ?) ON CONFLICT(meta_key) DO UPDATE SET value_txt = ?",
+		key,
+		value,
+		value)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (db *Database) WriteMetaInt(ctx context.Context, key string, value int64) error {
+	_, err := db.db.ExecContext(ctx, "INSERT INTO meta (meta_key, value_int) VALUES (?, ?) ON CONFLICT(meta_key) DO UPDATE SET value_int = ?",
+		key,
+		value,
+		value)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (db *Database) WriteMetaReal(ctx context.Context, key string, value float64) error {
+	_, err := db.db.ExecContext(ctx, "INSERT INTO meta (meta_key, value_real) VALUES (?, ?) ON CONFLICT(meta_key) DO UPDATE SET value_real = ?",
+		key,
+		value,
+		value)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (db *Database) WriteMetaBlob(ctx context.Context, key string, value []byte) error {
+	_, err := db.db.ExecContext(ctx, "INSERT INTO meta (meta_key, value_blob) VALUES (?, ?) ON CONFLICT(meta_key) DO UPDATE SET value_blob = ?",
+		key,
+		value,
+		value)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (db *Database) ReadMetaString(ctx context.Context, key string) (*string, error) {
+	r2, err := db.db.QueryContext(ctx, "SELECT value_txt FROM meta WHERE meta_key=?", key)
+	if err != nil {
+		return nil, err
+	}
+	if !r2.Next() {
+		return nil, errors.New("no matching entry in meta table")
+	}
+
+	var value string
+	err = r2.Scan(&value)
+	if err != nil {
+		return nil, err
+	}
+
+	return langext.Ptr(value), nil
+}
+
+func (db *Database) ReadMetaInt(ctx context.Context, key string) (*int64, error) {
+	r2, err := db.db.QueryContext(ctx, "SELECT value_int FROM meta WHERE meta_key=?", key)
+	if err != nil {
+		return nil, err
+	}
+	if !r2.Next() {
+		return nil, errors.New("no matching entry in meta table")
+	}
+
+	var value int64
+	err = r2.Scan(&value)
+	if err != nil {
+		return nil, err
+	}
+
+	return langext.Ptr(value), nil
+}
+
+func (db *Database) ReadMetaReal(ctx context.Context, key string) (*float64, error) {
+	r2, err := db.db.QueryContext(ctx, "SELECT value_real FROM meta WHERE meta_key=?", key)
+	if err != nil {
+		return nil, err
+	}
+	if !r2.Next() {
+		return nil, errors.New("no matching entry in meta table")
+	}
+
+	var value float64
+	err = r2.Scan(&value)
+	if err != nil {
+		return nil, err
+	}
+
+	return langext.Ptr(value), nil
+}
+
+func (db *Database) ReadMetaBlob(ctx context.Context, key string) (*[]byte, error) {
+	r2, err := db.db.QueryContext(ctx, "SELECT value_blob FROM meta WHERE meta_key=?", key)
+	if err != nil {
+		return nil, err
+	}
+	if !r2.Next() {
+		return nil, errors.New("no matching entry in meta table")
+	}
+
+	var value []byte
+	err = r2.Scan(&value)
+	if err != nil {
+		return nil, err
+	}
+
+	return langext.Ptr(value), nil
+}
+
+func (db *Database) DeleteMeta(ctx context.Context, key string) error {
+	_, err := db.db.ExecContext(ctx, "DELETE FROM meta WHERE meta_key = ?", key)
+	if err != nil {
+		return err
+	}
+	return nil
+}

server/db/schema/schema_3.ddl

@@ -125,4 +125,6 @@ CREATE TABLE `meta`
 
     PRIMARY KEY (meta_key)
 );
+
+
 INSERT INTO meta (meta_key, value_int) VALUES ('schema', 3)