Fall back to postgres when database connection string parsing fails (#842)

* Fall back to postgres when parsing the database connection string for a URI schema fails

* Fix behaviour so that it really tries postgres when URL parsing fails and it complains about unknown schema if it succeeds

1 files changed, 4 insertions, 2 deletions

diff --git a/federationsender/storage/storage.go b/federationsender/storage/storage.go
index 8cffdbf1..9f2805cf 100644
--- a/federationsender/storage/storage.go
+++ b/federationsender/storage/storage.go
@@ -34,12 +34,14 @@ type Database interface {
 func NewDatabase(dataSourceName string) (Database, error) {
 	uri, err := url.Parse(dataSourceName)
 	if err != nil {
-		return nil, err
+		// if the scheme doesn't match, fall back to postgres in case the config has
+		// postgres key=value connection strings
+		return postgres.NewDatabase(dataSourceName)
 	}
 	switch uri.Scheme {
 	case "postgres":
 		return postgres.NewDatabase(dataSourceName)
 	default:
-		return nil, errors.New("unknown schema")
+		return errors.New("unknown schema")
 	}
 }