mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

The driver name is always sqlite3 now

Browse source
This commit is contained in:
Neil Alexander 2021-07-06 10:22:49 +01:00
parent b21089e75d
commit 00632edc82
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/sqlutil/sql.go
View file

@ -19,7 +19,6 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"runtime"
"strings" "strings"
"github.com/matrix-org/util" "github.com/matrix-org/util"
@ -113,13 +112,6 @@ func QueryVariadicOffset(count, offset int) string {
return str return str
} }
func SQLiteDriverName() string {
if runtime.GOOS == "js" {
return "sqlite3_js"
}
return "sqlite3"
}
func minOfInts(a, b int) int { func minOfInts(a, b int) int {
if a <= b { if a <= b {
return a return a

4
internal/sqlutil/trace.go
View file

@ -104,7 +104,7 @@ func Open(dbProperties *config.DatabaseOptions) (*sql.DB, error) {
var driverName, dsn string var driverName, dsn string
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
driverName = SQLiteDriverName() driverName = "sqlite3"
dsn, err = ParseFileURI(dbProperties.ConnectionString) dsn, err = ParseFileURI(dbProperties.ConnectionString)
if err != nil { if err != nil {
return nil, fmt.Errorf("ParseFileURI: %w", err) return nil, fmt.Errorf("ParseFileURI: %w", err)
@ -123,7 +123,7 @@ func Open(dbProperties *config.DatabaseOptions) (*sql.DB, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if driverName != SQLiteDriverName() { if driverName != "sqlite3" {
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"MaxOpenConns": dbProperties.MaxOpenConns, "MaxOpenConns": dbProperties.MaxOpenConns,
"MaxIdleConns": dbProperties.MaxIdleConns, "MaxIdleConns": dbProperties.MaxIdleConns,