urdt/ussd
5
0
Fork 1
Code Issues 69 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

use postgres directly from go-vise

Browse Source
This commit is contained in:
Alfred Kamanda 2024-10-19 23:06:58 +03:00
parent fb0d2db156
commit 9f562fe53e
Signed by: Alfred-mk
GPG Key ID: 7EA3D01708908703
2 changed files with 2 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
internal/storage/postgres.go
View File

@ -1,74 +0,0 @@
package storage
import (
"context"
"git.defalsify.org/vise.git/db"
postgres "git.defalsify.org/vise.git/db/postgres"
"git.defalsify.org/vise.git/lang"
)
type PostgresDb struct {
db db.Db
connStr string
}
func NewPostgresDb() *PostgresDb {
return &PostgresDb{}
}
func (pdb *PostgresDb) Connect(ctx context.Context, connStr string) error {
if pdb.db != nil {
logg.WarnCtxf(ctx, "already connected, skipping", "connStr", connStr)
return nil
}
postgresdb := postgres.NewPgDb().WithSchema("public")
err := postgresdb.Connect(ctx, connStr)
if err != nil {
return err
}
pdb.db = postgresdb
pdb.connStr = connStr
return nil
}
func (pdb *PostgresDb) SetPrefix(pfx uint8) {
pdb.db.SetPrefix(pfx)
}
func (pdb *PostgresDb) SetSession(sessionId string) {
pdb.db.SetSession(sessionId)
}
func (pdb *PostgresDb) SetLanguage(lng *lang.Language) {
pdb.db.SetLanguage(lng)
}
func (pdb *PostgresDb) Safe() bool {
return pdb.db.Safe()
}
func (pdb *PostgresDb) Prefix() uint8 {
return pdb.db.Prefix()
}
func (pdb *PostgresDb) SetLock(typ uint8, locked bool) error {
return pdb.db.SetLock(typ, locked)
}
func (pdb *PostgresDb) Put(ctx context.Context, key []byte, val []byte) error {
return pdb.db.Put(ctx, key, val)
}
func (pdb *PostgresDb) Get(ctx context.Context, key []byte) ([]byte, error) {
return pdb.db.Get(ctx, key)
}
func (pdb *PostgresDb) Close() error {
if pdb.db == nil {
return nil
}
err := pdb.db.Close()
pdb.db = nil
return err
}

3
internal/storage/storageservice.go
View File

@ -8,6 +8,7 @@ import (
"git.defalsify.org/vise.git/db"
fsdb "git.defalsify.org/vise.git/db/fs"
"git.defalsify.org/vise.git/db/postgres"
"git.defalsify.org/vise.git/logging"
"git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource"
@ -67,7 +68,7 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
var err error
if database == "postgres" {
newDb = NewPostgresDb()
newDb = postgres.NewPgDb()
connStr := buildConnStr()
err = newDb.Connect(ctx, connStr)
} else {