Add ParseFileURI and use it when dealing with file URIs (#1088)

* Add ParseFileURI and use it when dealing with file URIs

Fixes #1059

* Missing file

* Linting

1 files changed, 1 insertions, 11 deletions

diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index 54a2f265..5596b5e3 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -18,8 +18,6 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	"errors"
-	"net/url"
 
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 
@@ -50,18 +48,10 @@ type Database struct {
 // nolint: gocyclo
 func Open(dataSourceName string) (*Database, error) {
 	var d Database
-	uri, err := url.Parse(dataSourceName)
+	cs, err := sqlutil.ParseFileURI(dataSourceName)
 	if err != nil {
 		return nil, err
 	}
-	var cs string
-	if uri.Opaque != "" { // file:filename.db
-		cs = uri.Opaque
-	} else if uri.Path != "" { // file:///path/to/filename.db
-		cs = uri.Path
-	} else {
-		return nil, errors.New("no filename or path in connect string")
-	}
 	if d.db, err = sqlutil.Open(internal.SQLiteDriverName(), cs, nil); err != nil {
 		return nil, err
 	}