backend/postgres: Add StatementTimeout and loose argument

Author: AlexisMontagne

backend/postgres/config.go

@@ -6,7 +6,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/url"
+	"strconv"
 	"sync"
+	"time"
 )
 
 type DBRole string
@@ -48,6 +50,10 @@ type Config struct {
 
 	Role DBRole
 
+	StatementTimeout time.Duration
+
+	ConnectionArguments map[string]string
+
 	certOnce sync.Once
 	certErr  error
 }
@@ -157,6 +163,17 @@ func (c *Config) DSN() (string, error) {
 		q.Add("application_name", c.ApplicationName)
 	}
 
+	if c.StatementTimeout > 0 {
+		q.Add(
+			"statement_timeout",
+			strconv.Itoa(int(c.StatementTimeout.Milliseconds())),
+		)
+	}
+
+	for k, v := range c.ConnectionArguments {
+		q.Add(k, v)
+	}
+
 	u := url.URL{
 		Scheme:   "postgres",
 		User:     c.userInfo(),

backend/postgres/config_test.go

@@ -2,6 +2,7 @@ package postgres
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -19,6 +20,10 @@ func TestDSN(t *testing.T) {
 			c:   &Config{DBName: "foobar", CACertFile: "foobar", ApplicationName: "buz"},
 			dsn: "postgres://localhost:5432/foobar?application_name=buz&sslmode=verify-ca&sslrootcert=foobar&sslsni=0",
 		},
+		{
+			c:   &Config{DBName: "foobar", ConnectionArguments: map[string]string{"foo": "bar"}, StatementTimeout: 2 * time.Second},
+			dsn: "postgres://localhost:5432/foobar?foo=bar&sslmode=disable&sslsni=0&statement_timeout=2000",
+		},
 	} {
 		dsn, err := tt.c.DSN()