mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-17 11:03:11 -06:00
Pull the fix for https://github.com/matrix-org/dendrite/issues/2838 into the dendrite subtree. Includes latest dendrite main. Signed-off-by: `Devon Hudson <devonhudson@librem.one>` Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Brian Meek <brian@hntlabs.com> Signed-off-by: Austin Ellis <austin@hntlabs.com> Signed-off-by: `Rubin Poster <rubinposter@gmail.com>` Signed-off-by: `ash lea <example@thisismyactual.email>` Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> Co-authored-by: devonh <devon.dmytro@gmail.com> Co-authored-by: Till <2353100+S7evinK@users.noreply.github.com> Co-authored-by: Ashley Nelson <fant@shley.email> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> Co-authored-by: Jean Lucas <jean@4ray.co> Co-authored-by: Kabir Kwatra <kabir@kwatra.me> Co-authored-by: sergekh2 <gitgitgit@khorun.com> Co-authored-by: texuf <texuf.eth@gmail.com> Co-authored-by: kegsay <kegan@matrix.org> Co-authored-by: Brian Meek <brian@here.video> Co-authored-by: John Terzis <john.c.terzis@gmail.com> Co-authored-by: John Terzis <john@hntlabs.com> Co-authored-by: Kerem <kerem.kazan@gmail.com> Co-authored-by: Neboer <43609792+Neboer@users.noreply.github.com> Co-authored-by: X. Ding <dingsm@gmail.com> Co-authored-by: dxl <dxl@plotbridge.com> Co-authored-by: ash lea <ashkitten@users.noreply.github.com> Co-authored-by: 0x1a8510f2 <admin@0x1a8510f2.space> Co-authored-by: Till Faelligen <tfaelligen@gmail.com> Co-authored-by: Till Faelligen <davidf@element.io>
30 lines
523 B
Go
30 lines
523 B
Go
//go:build !cgo
|
|
// +build !cgo
|
|
|
|
package sqlutil
|
|
|
|
import (
|
|
"modernc.org/sqlite"
|
|
"strings"
|
|
)
|
|
|
|
const SQLITE_DRIVER_NAME = "sqlite"
|
|
|
|
func sqliteDSNExtension(dsn string) string {
|
|
// add query parameters to the dsn
|
|
if strings.Contains(dsn, "?") {
|
|
dsn += "&"
|
|
} else {
|
|
dsn += "?"
|
|
}
|
|
|
|
// wait some time before erroring if the db is locked
|
|
// https://gitlab.com/cznic/sqlite/-/issues/106#note_1058094993
|
|
dsn += "_pragma=busy_timeout%3d10000"
|
|
return dsn
|
|
}
|
|
|
|
func sqliteDriver() *sqlite.Driver {
|
|
return &sqlite.Driver{}
|
|
}
|