diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-07-20 11:18:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 11:18:14 +0100 |
commit | f63068df3b9efb11f2677dd527994477b806ed19 (patch) | |
tree | 69c55298d104a9615ed50eb592a75297b0a416dc /internal/sqlutil | |
parent | 0ff078ebd706600f69a6491538e97abec6e0606f (diff) |
Only include go-sqlite3 on the relevant binaries (#1900)
* Only include go-sqlite3 on the relevant binaries
* The driver name is always sqlite3 now
* Update to matrix-org/go-sqlite3-js@e537baa
Diffstat (limited to 'internal/sqlutil')
-rw-r--r-- | internal/sqlutil/sql.go | 8 | ||||
-rw-r--r-- | internal/sqlutil/trace.go | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/internal/sqlutil/sql.go b/internal/sqlutil/sql.go index a3885d66..6cf17bea 100644 --- a/internal/sqlutil/sql.go +++ b/internal/sqlutil/sql.go @@ -19,7 +19,6 @@ import ( "database/sql" "errors" "fmt" - "runtime" "strings" "github.com/matrix-org/util" @@ -113,13 +112,6 @@ func QueryVariadicOffset(count, offset int) string { return str } -func SQLiteDriverName() string { - if runtime.GOOS == "js" { - return "sqlite3_js" - } - return "sqlite3" -} - func minOfInts(a, b int) int { if a <= b { return a diff --git a/internal/sqlutil/trace.go b/internal/sqlutil/trace.go index 5138aa59..51eaa1b4 100644 --- a/internal/sqlutil/trace.go +++ b/internal/sqlutil/trace.go @@ -104,7 +104,7 @@ func Open(dbProperties *config.DatabaseOptions) (*sql.DB, error) { var driverName, dsn string switch { case dbProperties.ConnectionString.IsSQLite(): - driverName = SQLiteDriverName() + driverName = "sqlite3" dsn, err = ParseFileURI(dbProperties.ConnectionString) if err != nil { return nil, fmt.Errorf("ParseFileURI: %w", err) @@ -123,7 +123,7 @@ func Open(dbProperties *config.DatabaseOptions) (*sql.DB, error) { if err != nil { return nil, err } - if driverName != SQLiteDriverName() { + if driverName != "sqlite3" { logrus.WithFields(logrus.Fields{ "MaxOpenConns": dbProperties.MaxOpenConns(), "MaxIdleConns": dbProperties.MaxIdleConns(), |