aboutsummaryrefslogtreecommitdiff
path: root/publicroomsapi/storage
diff options
context:
space:
mode:
Diffstat (limited to 'publicroomsapi/storage')
-rw-r--r--publicroomsapi/storage/postgres/storage.go4
-rw-r--r--publicroomsapi/storage/sqlite3/storage.go2
-rw-r--r--publicroomsapi/storage/storage.go9
3 files changed, 8 insertions, 7 deletions
diff --git a/publicroomsapi/storage/postgres/storage.go b/publicroomsapi/storage/postgres/storage.go
index 8c4660cc..6242c9d5 100644
--- a/publicroomsapi/storage/postgres/storage.go
+++ b/publicroomsapi/storage/postgres/storage.go
@@ -36,10 +36,10 @@ type PublicRoomsServerDatabase struct {
type attributeValue interface{}
// NewPublicRoomsServerDatabase creates a new public rooms server database.
-func NewPublicRoomsServerDatabase(dataSourceName string) (*PublicRoomsServerDatabase, error) {
+func NewPublicRoomsServerDatabase(dataSourceName string, dbProperties common.DbProperties) (*PublicRoomsServerDatabase, error) {
var db *sql.DB
var err error
- if db, err = sqlutil.Open("postgres", dataSourceName); err != nil {
+ if db, err = sqlutil.Open("postgres", dataSourceName, dbProperties); err != nil {
return nil, err
}
storage := PublicRoomsServerDatabase{
diff --git a/publicroomsapi/storage/sqlite3/storage.go b/publicroomsapi/storage/sqlite3/storage.go
index 12160162..efe35bdd 100644
--- a/publicroomsapi/storage/sqlite3/storage.go
+++ b/publicroomsapi/storage/sqlite3/storage.go
@@ -41,7 +41,7 @@ type attributeValue interface{}
func NewPublicRoomsServerDatabase(dataSourceName string) (*PublicRoomsServerDatabase, error) {
var db *sql.DB
var err error
- if db, err = sqlutil.Open(common.SQLiteDriverName(), dataSourceName); err != nil {
+ if db, err = sqlutil.Open(common.SQLiteDriverName(), dataSourceName, nil); err != nil {
return nil, err
}
storage := PublicRoomsServerDatabase{
diff --git a/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go
index e674514a..7dcfe563 100644
--- a/publicroomsapi/storage/storage.go
+++ b/publicroomsapi/storage/storage.go
@@ -19,6 +19,7 @@ package storage
import (
"net/url"
+ "github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/publicroomsapi/storage/postgres"
"github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3"
)
@@ -27,17 +28,17 @@ const schemePostgres = "postgres"
const schemeFile = "file"
// NewPublicRoomsServerDatabase opens a database connection.
-func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
+func NewPublicRoomsServerDatabase(dataSourceName string, dbProperties common.DbProperties) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
- return postgres.NewPublicRoomsServerDatabase(dataSourceName)
+ return postgres.NewPublicRoomsServerDatabase(dataSourceName, dbProperties)
}
switch uri.Scheme {
case schemePostgres:
- return postgres.NewPublicRoomsServerDatabase(dataSourceName)
+ return postgres.NewPublicRoomsServerDatabase(dataSourceName, dbProperties)
case schemeFile:
return sqlite3.NewPublicRoomsServerDatabase(dataSourceName)
default:
- return postgres.NewPublicRoomsServerDatabase(dataSourceName)
+ return postgres.NewPublicRoomsServerDatabase(dataSourceName, dbProperties)
}
}