Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Skip empty config fields in Postgres connect DSN. Closes #2275.

Kailash Nadhb50218601075
diff --git a/cmd/init.go b/cmd/init.go
index 93d8748a..7b2f7016 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -17,6 +17,7 @@ import (
"path"
"path/filepath"
"runtime"
+ "strconv"
"strings"
"syscall"
"time"
@@ -326,8 +327,34 @@ func initDB() *sqlx.DB {
}
lo.Printf("connecting to db: %s:%d/%s", c.Host, c.Port, c.DBName)
- db, err := sqlx.Connect("postgres",
- fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s %s", c.Host, c.Port, c.User, c.Password, c.DBName, c.SSLMode, c.Params))
+
+ // Build Postgres DSN conditionally with non-empty fields.
+ fields := map[string]string{
+ "host": c.Host,
+ "port": strconv.Itoa(c.Port),
+ "user": c.User,
+ "password": c.Password,
+ "dbname": c.DBName,
+ "sslmode": c.SSLMode,
+ }
+ if c.Port == 0 {
+ delete(fields, "port")
+ }
+
+ var parts []string
+ for k, v := range fields {
+ if v == "" {
+ continue
+ }
+
+ parts = append(parts, k+"="+v)
+ }
+
+ if c.Params != "" {
+ parts = append(parts, c.Params)
+ }
+
+ db, err := sqlx.Connect("postgres", strings.Join(parts, " "))
if err != nil {
lo.Fatalf("error connecting to DB: %v", err)
}