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

common/keydb/keydb.go

@@ -16,6 +16,7 @@ package keydb
 
 import (
 	"context"
+	"errors"
 	"net/url"
 
 	"github.com/matrix-org/dendrite/common/keydb/postgres"
@@ -32,14 +33,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:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return nil, errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.NewDatabase(dataSourceName)
 	}
 }

federationsender/storage/storage.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"net/url"
 
 	"github.com/matrix-org/dendrite/common"
@@ -33,14 +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:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.NewDatabase(dataSourceName)
 	}
 }

mediaapi/storage/storage.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"net/url"
 
 	"github.com/matrix-org/dendrite/mediaapi/storage/postgres"
@@ -35,14 +36,14 @@ type Database interface {
 func Open(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.Open(dataSourceName)
 	}
 	switch uri.Scheme {
 	case "postgres":
 		return postgres.Open(dataSourceName)
 	default:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return nil, errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.Open(dataSourceName)
 	}
 }

publicroomsapi/storage/storage.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"net/url"
 
 	"github.com/matrix-org/dendrite/common"
@@ -38,14 +39,14 @@ type Database interface {
 func NewPublicRoomsServerDatabase(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.NewPublicRoomsServerDatabase(dataSourceName)
 	}
 	switch uri.Scheme {
 	case "postgres":
 		return postgres.NewPublicRoomsServerDatabase(dataSourceName)
 	default:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return nil, errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.NewPublicRoomsServerDatabase(dataSourceName)
 	}
 }

roomserver/storage/storage.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"net/url"
 
 	"github.com/matrix-org/dendrite/roomserver/api"
@@ -60,14 +61,14 @@ type Database interface {
 func Open(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.Open(dataSourceName)
 	}
 	switch uri.Scheme {
 	case "postgres":
 		return postgres.Open(dataSourceName)
 	default:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return nil, errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.Open(dataSourceName)
 	}
 }

syncapi/storage/storage.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"net/url"
 	"time"
 
@@ -51,14 +52,14 @@ type Database interface {
 func NewSyncServerDatasource(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.NewSyncServerDatasource(dataSourceName)
 	}
 	switch uri.Scheme {
 	case "postgres":
 		return postgres.NewSyncServerDatasource(dataSourceName)
 	default:
-		// if the scheme doesn't match, fall back to postgres in case the config has
+		return nil, errors.New("unknown schema")
-		// postgres key=value connection strings
-		return postgres.NewSyncServerDatasource(dataSourceName)
 	}
 }