From d35e7bffd3c9bfdaa874e1dc18c43f93378fee75 Mon Sep 17 00:00:00 2001 From: riwiwa Date: Mon, 9 Feb 2026 18:34:37 -0800 Subject: [PATCH] remove db name environment variable --- db/db.go | 12 ++++++------ main.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/db/db.go b/db/db.go index f07297c..1787725 100644 --- a/db/db.go +++ b/db/db.go @@ -21,23 +21,23 @@ func CreateAllTables() error { return CreateSessionsTable() } -func GetDbUrl(noDBName bool) string { +func GetDbUrl(dbName bool) string { host := os.Getenv("PGHOST") port := os.Getenv("PGPORT") user := os.Getenv("PGUSER") pass := os.Getenv("PGPASSWORD") - db := os.Getenv("PGDATABASE") - if noDBName { - return fmt.Sprintf("postgres://%s:%s@%s:%s", user, pass, host, port) + if dbName { + return fmt.Sprintf("postgres://%s:%s@%s:%s/%s", + user, pass, host, port, "muzi") } else { - return fmt.Sprintf("postgres://%s:%s@%s:%s/%s", user, pass, host, port, db) + return fmt.Sprintf("postgres://%s:%s@%s:%s", user, pass, host, port) } } func CreateDB() error { conn, err := pgx.Connect(context.Background(), - GetDbUrl(true), + GetDbUrl(false), ) if err != nil { fmt.Fprintf(os.Stderr, "Cannot connect to PostgreSQL: %v\n", err) diff --git a/main.go b/main.go index 97f96c2..f154523 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ func main() { check("ensuring muzi DB exists", db.CreateDB()) var err error - db.Pool, err = pgxpool.New(context.Background(), db.GetDbUrl(false)) + db.Pool, err = pgxpool.New(context.Background(), db.GetDbUrl(true)) check("connecting to muzi database", err) defer db.Pool.Close()