mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-15 02:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix database statement not prepared

Browse source
This commit is contained in:
Remi Reuvekamp 2017-10-15 00:36:31 +00:00
parent db88b4d9ab
commit 5c48d7316e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
View file

@ -85,6 +85,9 @@ func (s *devicesStatements) prepare(db *sql.DB, server gomatrixserverlib.ServerN
if s.deleteDeviceStmt, err = db.Prepare(deleteDeviceSQL); err != nil { if s.deleteDeviceStmt, err = db.Prepare(deleteDeviceSQL); err != nil {
return return
} }
if s.deleteDevicesByLocalpartStmt, err = db.Prepare(deleteDevicesByLocalpartSQL); err != nil {
return
}
s.serverName = server s.serverName = server
return return
} }
@ -118,7 +121,7 @@ func (s *devicesStatements) deleteDevice(
func (s *devicesStatements) deleteDevicesByLocalpart( func (s *devicesStatements) deleteDevicesByLocalpart(
ctx context.Context, txn *sql.Tx, localpart string, ctx context.Context, txn *sql.Tx, localpart string,
) error { ) error {
stmt := common.TxStmt(txn, s.deleteDeviceStmt) stmt := common.TxStmt(txn, s.deleteDevicesByLocalpartStmt)
_, err := stmt.ExecContext(ctx, localpart) _, err := stmt.ExecContext(ctx, localpart)
return err return err
} }

4
src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
View file

@ -111,8 +111,8 @@ func (d *Database) RemoveDevice(
} }
// RemoveAllDevices revokes devices by deleting the entry in the // RemoveAllDevices revokes devices by deleting the entry in the
// database matching with the given user ID localpart. // database matching the given user ID localpart.
// If something went wrong during the deletion, it will return the SQL error // If something went wrong during the deletion, it will return the SQL error.
func (d *Database) RemoveAllDevices( func (d *Database) RemoveAllDevices(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) error { ) error {