Fix - again...
MODIFY
common/keydb/keydb.go
common/keydb/keydb.go
@@ -16,7 +16,6 @@ package keydb
import (
"context"
- "errors"
"net/url"
"github.com/matrix-org/dendrite/common/keydb/postgres"
@@ -33,14 +32,12 @@ type Database interface {
func NewDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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 postgres.NewDatabase(dataSourceName)
}
}

MODIFY
federationsender/storage/storage.go
federationsender/storage/storage.go
@@ -16,7 +16,6 @@ package storage
import (
"context"
- "errors"
"net/url"
"github.com/matrix-org/dendrite/common"
@@ -34,14 +33,12 @@ type Database interface {
func NewDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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 postgres.NewDatabase(dataSourceName)
}
}

MODIFY
mediaapi/storage/storage.go
mediaapi/storage/storage.go
@@ -16,7 +16,6 @@ package storage
import (
"context"
- "errors"
"net/url"
"github.com/matrix-org/dendrite/mediaapi/storage/postgres"
@@ -36,14 +35,12 @@ type Database interface {
func Open(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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:
- return nil, errors.New("unknown schema")
+ return postgres.Open(dataSourceName)
}
}

MODIFY
publicroomsapi/storage/storage.go
publicroomsapi/storage/storage.go
@@ -16,7 +16,6 @@ package storage
import (
"context"
- "errors"
"net/url"
"github.com/matrix-org/dendrite/common"
@@ -39,14 +38,12 @@ type Database interface {
func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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:
- return nil, errors.New("unknown schema")
+ return postgres.NewPublicRoomsServerDatabase(dataSourceName)
}
}

MODIFY
roomserver/storage/storage.go
roomserver/storage/storage.go
@@ -16,7 +16,6 @@ package storage
import (
"context"
- "errors"
"net/url"
"github.com/matrix-org/dendrite/roomserver/api"
@@ -61,14 +60,12 @@ type Database interface {
func Open(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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:
- return nil, errors.New("unknown schema")
+ return postgres.Open(dataSourceName)
}
}

MODIFY
syncapi/storage/storage.go
syncapi/storage/storage.go
@@ -16,7 +16,6 @@ package storage
import (
"context"
- "errors"
"net/url"
"time"
@@ -52,14 +51,12 @@ type Database interface {
func NewSyncServerDatasource(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- // 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:
- return nil, errors.New("unknown schema")
+ return postgres.NewSyncServerDatasource(dataSourceName)
}
}

Fix #842 - again...