Use one PG connection, add support for connection params

user/manager_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/bcrypt"
+	"heckel.io/ntfy/v2/postgres"
 	"heckel.io/ntfy/v2/util"
 )
 
@@ -38,7 +39,7 @@ func forEachBackend(t *testing.T, f func(t *testing.T, newStore newStoreFunc)) {
 			t.Skip("NTFY_TEST_DATABASE_URL not set")
 		}
 		schema := fmt.Sprintf("test_%s", util.RandomString(10))
-		setupDB, err := sql.Open("pgx", dsn)
+		setupDB, err := postgres.OpenDB(dsn)
 		require.Nil(t, err)
 		_, err = setupDB.Exec(fmt.Sprintf("CREATE SCHEMA %s", schema))
 		require.Nil(t, err)
@@ -50,12 +51,16 @@ func forEachBackend(t *testing.T, f func(t *testing.T, newStore newStoreFunc)) {
 		u.RawQuery = q.Encode()
 		schemaDSN := u.String()
 		t.Cleanup(func() {
-			cleanDB, _ := sql.Open("pgx", dsn)
-			cleanDB.Exec(fmt.Sprintf("DROP SCHEMA %s CASCADE", schema))
-			cleanDB.Close()
+			cleanDB, _ := postgres.OpenDB(dsn)
+			if cleanDB != nil {
+				cleanDB.Exec(fmt.Sprintf("DROP SCHEMA %s CASCADE", schema))
+				cleanDB.Close()
+			}
 		})
 		f(t, func() Store {
-			store, err := NewPostgresStore(schemaDSN)
+			db, err := postgres.OpenDB(schemaDSN)
+			require.Nil(t, err)
+			store, err := NewPostgresStore(db)
 			require.Nil(t, err)
 			return store
 		})

user/store_postgres.go

@@ -2,8 +2,6 @@ package user
 
 import (
 	"database/sql"
-
-	_ "github.com/jackc/pgx/v5/stdlib" // PostgreSQL driver
 )
 
 // PostgreSQL queries
@@ -206,16 +204,8 @@ const (
 	`
 )
 
-// NewPostgresStore creates a new PostgreSQL-backed user store
-func NewPostgresStore(dsn string) (Store, error) {
-	db, err := sql.Open("pgx", dsn)
-	if err != nil {
-		return nil, err
-	}
-	db.SetMaxOpenConns(25)
-	if err := db.Ping(); err != nil {
-		return nil, err
-	}
+// NewPostgresStore creates a new PostgreSQL-backed user store using an existing database connection pool.
+func NewPostgresStore(db *sql.DB) (Store, error) {
 	if err := setupPostgres(db); err != nil {
 		return nil, err
 	}

user/store_postgres_test.go

@@ -1,13 +1,13 @@
 package user_test
 
 import (
-	"database/sql"
 	"fmt"
 	"net/url"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"heckel.io/ntfy/v2/postgres"
 	"heckel.io/ntfy/v2/user"
 	"heckel.io/ntfy/v2/util"
 )
@@ -17,24 +17,25 @@ func newTestPostgresStore(t *testing.T) user.Store {
 	if dsn == "" {
 		t.Skip("NTFY_TEST_DATABASE_URL not set, skipping PostgreSQL tests")
 	}
-	// Create a unique schema for this test
 	schema := fmt.Sprintf("test_%s", util.RandomString(10))
-	setupDB, err := sql.Open("pgx", dsn)
-	require.Nil(t, err)
-	_, err = setupDB.Exec(fmt.Sprintf("CREATE SCHEMA %s", schema))
-	require.Nil(t, err)
-	require.Nil(t, setupDB.Close())
-	// Open store with search_path set to the new schema
 	u, err := url.Parse(dsn)
 	require.Nil(t, err)
 	q := u.Query()
 	q.Set("search_path", schema)
 	u.RawQuery = q.Encode()
-	store, err := user.NewPostgresStore(u.String())
+	schemaDSN := u.String()
+	setupDB, err := postgres.OpenDB(dsn)
+	require.Nil(t, err)
+	_, err = setupDB.Exec(fmt.Sprintf("CREATE SCHEMA %s", schema))
+	require.Nil(t, err)
+	require.Nil(t, setupDB.Close())
+	db, err := postgres.OpenDB(schemaDSN)
+	require.Nil(t, err)
+	store, err := user.NewPostgresStore(db)
 	require.Nil(t, err)
 	t.Cleanup(func() {
 		store.Close()
-		cleanDB, err := sql.Open("pgx", dsn)
+		cleanDB, err := postgres.OpenDB(dsn)
 		if err == nil {
 			cleanDB.Exec(fmt.Sprintf("DROP SCHEMA %s CASCADE", schema))
 			cleanDB.Close()