riwiwa/muzi
1
0
Fork 0
mirror of https://github.com/riwiwa/muzi.git synced 2026-02-28 11:56:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

remove db name environment variable

Browse Source
This commit is contained in:
riwiwa
2026-02-09 18:34:37 -08:00
parent a70dc4882b
commit d35e7bffd3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
db/db.go
View File

@@ -21,23 +21,23 @@ func CreateAllTables() error {
return CreateSessionsTable() return CreateSessionsTable()
} }
func GetDbUrl(noDBName bool) string { func GetDbUrl(dbName bool) string {
host := os.Getenv("PGHOST") host := os.Getenv("PGHOST")
port := os.Getenv("PGPORT") port := os.Getenv("PGPORT")
user := os.Getenv("PGUSER") user := os.Getenv("PGUSER")
pass := os.Getenv("PGPASSWORD") pass := os.Getenv("PGPASSWORD")
db := os.Getenv("PGDATABASE")
if noDBName { if dbName {
return fmt.Sprintf("postgres://%s:%s@%s:%s", user, pass, host, port) return fmt.Sprintf("postgres://%s:%s@%s:%s/%s",
user, pass, host, port, "muzi")
} else { } 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 { func CreateDB() error {
conn, err := pgx.Connect(context.Background(), conn, err := pgx.Connect(context.Background(),
GetDbUrl(true), GetDbUrl(false),
) )
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Cannot connect to PostgreSQL: %v\n", err) fmt.Fprintf(os.Stderr, "Cannot connect to PostgreSQL: %v\n", err)

2
main.go
View File

@@ -22,7 +22,7 @@ func main() {
check("ensuring muzi DB exists", db.CreateDB()) check("ensuring muzi DB exists", db.CreateDB())
var err error 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) check("connecting to muzi database", err)
defer db.Pool.Close() defer db.Pool.Close()