0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-25 19:33:47 +01:00
dendrite/cmd
0x1a8510f2 51ab0a8ccf
Fix moderncsqlite errors and rebase onto main (#2832)
This is #2819 but rebased on latest `main`. This PR is against main too
as opposed to the `moderncsqlite` branch.

The main change here is simply:

```go
// 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"
```

### Pull Request Checklist

<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->

* [x] I have added tests for PR _or_ I have justified why this PR
doesn't need tests.
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately

Signed off privately.

Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
2022-11-02 13:20:10 +00:00
..
create-account Return error if we fail to read the response body 2022-10-17 07:27:11 +02:00
dendrite-demo-pinecone Fix moderncsqlite errors and rebase onto main (#2832) 2022-11-02 13:20:10 +00:00
dendrite-demo-yggdrasil Fix moderncsqlite errors and rebase onto main (#2832) 2022-11-02 13:20:10 +00:00
dendrite-monolith-server Fix moderncsqlite errors and rebase onto main (#2832) 2022-11-02 13:20:10 +00:00
dendrite-polylith-multi Fix moderncsqlite errors and rebase onto main (#2832) 2022-11-02 13:20:10 +00:00
dendrite-upgrade-tests Hopefully fix upgrade-tests (#2717) 2022-09-15 07:26:26 +02:00
dendritejs-pinecone Revert Docker changes 2022-10-04 11:33:05 +01:00
furl Do not use ioutil as it is deprecated (#2625) 2022-08-05 10:26:59 +01:00
generate-config Update search docs 2022-09-27 17:10:47 +01:00
generate-keys Complement QoL changes (#2663) 2022-08-23 13:10:29 +02:00
resolve-state Optimise resolve-state tool 2022-09-05 14:17:04 +01:00