Merge branch 'main' into main

postgres/README.md

@@ -17,6 +17,7 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error
 func (s *Storage) Delete(key string) error
 func (s *Storage) Reset() error
 func (s *Storage) Close() error
+func (s *Storage) Conn() *sql.DB
 ```
 ### Installation
 Postgres is tested on the 2 last [Go versions](https://golang.org/dl/) with support for modules. So make sure to initialize one first if you didn't do that yet:
@@ -49,12 +50,24 @@ store := postgres.New(postgres.Config{
 	GCInterval:      10 * time.Second,
 	SslMode:         "disable",
 })
+
+// Initialize custom config using connection string
+store := postgres.New(postgres.Config{
+	ConnectionURI:   "postgresql://user:password@localhost:5432/fiber"
+	Reset:           false,
+	GCInterval:      10 * time.Second,
+})
 ```
 
 ### Config
 ```go
 // Config defines the config for storage.
 type Config struct {
+	// Connection string to use for DB. Will override all other authentication values if used
+	//
+	// Optional. Default is ""
+	ConnectionURI string
+
 	// Host name where the DB is hosted
 	//
 	// Optional. Default is "127.0.0.1"
@@ -105,6 +118,7 @@ type Config struct {
 ### Default Config
 ```go
 var ConfigDefault = Config{
+	ConnectionURI:   "",
 	Host:            "127.0.0.1",
 	Port:            5432,
 	Database:        "fiber",

postgres/config.go

@@ -6,6 +6,11 @@ import (
 
 // Config defines the config for storage.
 type Config struct {
+	// Connection string to use for DB. Will override all other authentication values if used
+	//
+	// Optional. Default is ""
+	ConnectionURI string
+
 	// Host name where the DB is hosted
 	//
 	// Optional. Default is "127.0.0.1"
@@ -90,6 +95,7 @@ type Config struct {
 
 // ConfigDefault is the default config
 var ConfigDefault = Config{
+	ConnectionURI:   "",
 	Host:            "127.0.0.1",
 	Port:            5432,
 	Database:        "fiber",

postgres/postgres.go

@@ -46,26 +46,31 @@ func New(config ...Config) *Storage {
 	cfg := configDefault(config...)
 
 	// Create data source name
-	var dsn string = "postgresql://"
-	if cfg.Username != "" {
-		dsn += url.QueryEscape(cfg.Username)
-	}
-	if cfg.Password != "" {
-		dsn += ":" + cfg.Password
-	}
-	if cfg.Username != "" || cfg.Password != "" {
-		dsn += "@"
-	}
-	// unix socket host path
-	if strings.HasPrefix(cfg.Host, "/") {
-		dsn += fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)
+	var dsn string
+	if cfg.ConnectionURI != "" {
+		dsn = cfg.ConnectionURI
 	} else {
-		dsn += fmt.Sprintf("%s:%d", url.QueryEscape(cfg.Host), cfg.Port)
+		dsn = "postgresql://"
+		if cfg.Username != "" {
+			dsn += url.QueryEscape(cfg.Username)
+		}
+		if cfg.Password != "" {
+			dsn += ":" + cfg.Password
+		}
+		if cfg.Username != "" || cfg.Password != "" {
+			dsn += "@"
+		}
+		// unix socket host path
+		if strings.HasPrefix(cfg.Host, "/") {
+			dsn += fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)
+		} else {
+			dsn += fmt.Sprintf("%s:%d", url.QueryEscape(cfg.Host), cfg.Port)
+		}
+		dsn += fmt.Sprintf("/%s?connect_timeout=%d&sslmode=%s",
+			url.QueryEscape(cfg.Database),
+			int64(cfg.timeout.Seconds()),
+			cfg.SslMode)
 	}
-	dsn += fmt.Sprintf("/%s?connect_timeout=%d&sslmode=%s",
-		url.QueryEscape(cfg.Database),
-		int64(cfg.timeout.Seconds()),
-		cfg.SslMode)
 
 	// Create db
 	db, err := sql.Open("postgres", dsn)
@@ -184,6 +189,11 @@ func (s *Storage) Close() error {
 	return s.db.Close()
 }
 
+// Return database client
+func (s *Storage) Conn() *sql.DB {
+	return s.db
+}
+
 // gcTicker starts the gc ticker
 func (s *Storage) gcTicker() {
 	ticker := time.NewTicker(s.gcInterval)

postgres/postgres_test.go

@@ -177,3 +177,7 @@ func Test_SslRequiredMode(t *testing.T) {
 func Test_Postgres_Close(t *testing.T) {
 	utils.AssertEqual(t, nil, testStore.Close())
 }
+
+func Test_Postgres_Conn(t *testing.T) {
+	utils.AssertEqual(t, true, testStore.Conn() != nil)
+}