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

create a schema if it does not exist and use it in the connection

Browse Source
This commit is contained in:
Alfred Kamanda 2025-01-08 10:37:47 +03:00 committed by konstantinmds
parent 0f6c486ee0
commit 25c1cc41bb
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
internal/storage/storage_service.go
View File

@ -14,6 +14,7 @@ import (
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/resource"
gdbmstorage "git.grassecon.net/urdt/ussd/internal/storage/db/gdbm" gdbmstorage "git.grassecon.net/urdt/ussd/internal/storage/db/gdbm"
"github.com/jackc/pgx/v5/pgxpool"
) )
var ( var (
@ -46,21 +47,28 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
var newDb db.Db var newDb db.Db
var err error var err error
schema, ok := ctx.Value("Schema").(string)
if !ok {
return nil, fmt.Errorf("failed to select the schema")
}
if existingDb != nil { if existingDb != nil {
return existingDb, nil return existingDb, nil
} }
connStr := ms.conn.String() if database == "postgres" {
dbTyp := ms.conn.DbType() connStr := buildConnStr()
if dbTyp == DBTYPE_POSTGRES {
newDb = postgres.NewPgDb() // Ensure the schema exists
} else if dbTyp == DBTYPE_GDBM { err = ensureSchemaExists(ctx, connStr, schema)
err = ms.ensureDbDir()
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to ensure schema exists: %w", err)
} }
connStr = path.Join(connStr, section)
newDb = postgres.NewPgDb().WithSchema(schema)
err = newDb.Connect(ctx, connStr)
} else {
newDb = gdbmstorage.NewThreadGdbmDb() newDb = gdbmstorage.NewThreadGdbmDb()
} else { } else {
return nil, fmt.Errorf("unsupported connection string: '%s'\n", ms.conn.String()) return nil, fmt.Errorf("unsupported connection string: '%s'\n", ms.conn.String())
@ -74,26 +82,21 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
return newDb, nil return newDb, nil
} }
// WithGettext triggers use of gettext for translation of templates and menus. // ensureSchemaExists creates a new schema if it does not exist
// func ensureSchemaExists(ctx context.Context, connStr, schema string) error {
// The first language in `lns` will be used as default language, to resolve node keys to conn, err := pgxpool.New(ctx, connStr)
// language strings. if err != nil {
// return fmt.Errorf("failed to connect to the database: %w", err)
// If `lns` is an empty array, gettext will not be used.
func (ms *MenuStorageService) WithGettext(path string, lns []lang.Language) *MenuStorageService {
if len(lns) == 0 {
logg.Warnf("Gettext requested but no languages supplied")
return ms
} }
rs := resource.NewPoResource(lns[0], path) defer conn.Close()
for _, ln := range(lns) { query := fmt.Sprintf("CREATE SCHEMA IF NOT EXISTS %s", schema)
rs = rs.WithLanguage(ln) _, err = conn.Exec(ctx, query)
if err != nil {
return fmt.Errorf("failed to create schema: %w", err)
} }
ms.poResource = rs return nil
return ms
} }
func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) { func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {