aboutsummaryrefslogtreecommitdiff
path: root/mediaapi
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-01-09 17:18:19 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2020-01-09 17:18:19 +0000
commit9e489845eb64636821c180bbf07ffe5e0bcf1ed6 (patch)
tree1a1517794bf10f1fbd427b21b9eae33f756ec7bb /mediaapi
parentee8e167844fd4d18175cba384996bd2e198f41e4 (diff)
Fix #842 - again...
Diffstat (limited to 'mediaapi')
-rw-r--r--mediaapi/storage/storage.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go
index ca9f69f8..2c7f937d 100644
--- a/mediaapi/storage/storage.go
+++ b/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)
}
}