aboutsummaryrefslogtreecommitdiff
path: root/common/keydb
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-04-16 10:06:55 +0100
committerGitHub <noreply@github.com>2020-04-16 10:06:55 +0100
commitc1bca95adbe04a17d8feb91aa24dde9c4cffb1fb (patch)
treefca3ee9732ef93a9f8c664956c06de8b4c2c4058 /common/keydb
parentc2ea96190944d8e39b0c200e43b1eedfeeeb49a6 (diff)
Add SQL tracing via DENDRITE_TRACE_SQL (#968)
* Add SQL tracing via DENDRITE_TRACE_SQL Add this to `internal/sqlutil` in preparation for #897 * Not entirely
Diffstat (limited to 'common/keydb')
-rw-r--r--common/keydb/postgres/keydb.go4
-rw-r--r--common/keydb/sqlite3/keydb.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/common/keydb/postgres/keydb.go b/common/keydb/postgres/keydb.go
index 2dd8c866..2879683e 100644
--- a/common/keydb/postgres/keydb.go
+++ b/common/keydb/postgres/keydb.go
@@ -17,11 +17,11 @@ package postgres
import (
"context"
- "database/sql"
"math"
"golang.org/x/crypto/ed25519"
+ "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib"
)
@@ -41,7 +41,7 @@ func NewDatabase(
serverKey ed25519.PublicKey,
serverKeyID gomatrixserverlib.KeyID,
) (*Database, error) {
- db, err := sql.Open("postgres", dataSourceName)
+ db, err := sqlutil.Open("postgres", dataSourceName)
if err != nil {
return nil, err
}
diff --git a/common/keydb/sqlite3/keydb.go b/common/keydb/sqlite3/keydb.go
index 3c860d0c..82d2a491 100644
--- a/common/keydb/sqlite3/keydb.go
+++ b/common/keydb/sqlite3/keydb.go
@@ -17,12 +17,12 @@ package sqlite3
import (
"context"
- "database/sql"
"math"
"golang.org/x/crypto/ed25519"
"github.com/matrix-org/dendrite/common"
+ "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib"
_ "github.com/mattn/go-sqlite3"
@@ -44,7 +44,7 @@ func NewDatabase(
serverKey ed25519.PublicKey,
serverKeyID gomatrixserverlib.KeyID,
) (*Database, error) {
- db, err := sql.Open(common.SQLiteDriverName(), dataSourceName)
+ db, err := sqlutil.Open(common.SQLiteDriverName(), dataSourceName)
if err != nil {
return nil, err
}