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

Review comments

Browse source
This commit is contained in:
Kegan Dougal 2020-08-27 18:33:47 +01:00
parent 394d2c7c44
commit c43c56087f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
userapi/storage/devices/sqlite3/storage.go
View file

@ -181,7 +181,7 @@ func (d *Database) RemoveDevices(
func (d *Database) RemoveAllDevices( func (d *Database) RemoveAllDevices(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) (devices []api.Device, err error) { ) (devices []api.Device, err error) {
err = sqlutil.WithTransaction(d.db, func(txn *sql.Tx) error { err = d.writer.Do(d.db, nil, func(txn *sql.Tx) error {
devices, err = d.devices.selectDevicesByLocalpart(ctx, txn, localpart) devices, err = d.devices.selectDevicesByLocalpart(ctx, txn, localpart)
if err != nil { if err != nil {
return err return err

4
userapi/userapi_test.go
View file

@ -31,7 +31,9 @@ func MustMakeInternalAPI(t *testing.T) (api.UserInternalAPI, accounts.Database)
} }
cfg := &config.UserAPI{ cfg := &config.UserAPI{
DeviceDatabase: config.DatabaseOptions{ DeviceDatabase: config.DatabaseOptions{
ConnectionString: "file::memory:", ConnectionString: "file::memory:",
MaxOpenConnections: 1,
MaxIdleConnections: 1,
}, },
Matrix: &config.Global{ Matrix: &config.Global{
ServerName: serverName, ServerName: serverName,