taldir

commit ba6b7b09a68e1f02a5edd71eb1d16fd36ca4a58f
parent a349cda61711c06c5238c8e07450f1fcb5189696
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Sun, 15 Feb 2026 08:02:00 +0100

use alternative version strings for postgres

Diffstat:
M
cmd/taldir-dbinit/main.go
 | 
23
++++-------------------
M
cmd/taldir-server/main.go
 | 
22
++--------------------

2 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/cmd/taldir-dbinit/main.go b/cmd/taldir-dbinit/main.go
@@ -25,6 +25,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"strings"
 
 	"rsc.io/getopt"
 	"taler.net/taldir/pkg/taldir"
@@ -102,25 +103,9 @@ func main() {
 			os.Exit(1)
 		}
 	}
-	dbHost := cfg.Section("taldir-pq").Key("host").MustString("localhost")
-	dbName := cfg.Section("taldir-pq").Key("db_name").MustString("taldir")
-	dbPort := cfg.Section("taldir-pq").Key("port").MustInt64(5432)
-	dbUser := cfg.Section("taldir-pq").Key("user").MustString("")
-	dbPassword := cfg.Section("taldir-pq").Key("password").MustString("")
-	psqlconn := fmt.Sprintf("host=%s port=%d dbname=%s sslmode=disable",
-		dbHost,
-		dbPort,
-		dbName)
-	if dbUser != "" {
-		psqlconn = fmt.Sprintf("%s user=%s",
-			psqlconn,
-			dbUser)
-	}
-	if dbPassword != "" {
-		psqlconn = fmt.Sprintf("%s password=%s",
-			psqlconn,
-			dbPassword)
-	}
+	psqlconn := cfg.Section("taldir-pq").Key("connection_string").MustString("postgres:///taler-directory")
+	segments := strings.Split(strings.Split(psqlconn, "?")[0], "/")
+	dbName := segments[len(segments)-1]
 
 	db, err := sql.Open("postgres", psqlconn)
 	if err != nil {
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
@@ -35,6 +35,7 @@ import (
 	"path"
 
 	"database/sql"
+
 	_ "github.com/lib/pq"
 	"github.com/schanzen/taler-go/pkg/merchant"
 	"gopkg.in/ini.v1"
@@ -95,26 +96,7 @@ func main() {
 		log.Fatalf("Failed to read config: %v", err)
 		os.Exit(1)
 	}
-	dbHost := cfg.Section("taldir-pq").Key("host").MustString("localhost")
-	dbName := cfg.Section("taldir-pq").Key("db_name").MustString("taldir")
-	dbPort := cfg.Section("taldir-pq").Key("port").MustInt64(5432)
-	dbUser := cfg.Section("taldir-pq").Key("user").MustString("")
-	dbPassword := cfg.Section("taldir-pq").Key("password").MustString("")
-	psqlconn := fmt.Sprintf("host=%s port=%d dbname=%s sslmode=disable",
-		dbHost,
-		dbPort,
-		dbName)
-	if dbUser != "" {
-		psqlconn = fmt.Sprintf("%s user=%s",
-			psqlconn,
-			dbUser)
-	}
-	if dbPassword != "" {
-		psqlconn = fmt.Sprintf("%s password=%s",
-			psqlconn,
-			dbPassword)
-	}
-
+	psqlconn := cfg.Section("taldir-pq").Key("connection_string").MustString("postgres:///taler-directory")
 
 	db, err := sql.Open("postgres", psqlconn)
 	if err != nil {