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

fix sql thinko

Browse source
This commit is contained in:
Matthew Hodgson 2020-09-12 00:24:22 +01:00
parent 410ac724a6
commit f8bb4487df
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationsender/storage/sqlite3/remote_peeks_table.go
View file

@ -115,13 +115,9 @@ func (s *remotePeeksStatements) RenewRemotePeek(
func (s *remotePeeksStatements) SelectRemotePeek( func (s *remotePeeksStatements) SelectRemotePeek(
ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string,
) (*types.RemotePeek, error) { ) (*types.RemotePeek, error) {
rows, err := sqlutil.TxStmt(txn, s.selectRemotePeeksStmt).QueryContext(ctx, roomID) row := sqlutil.TxStmt(txn, s.selectRemotePeeksStmt).QueryRowContext(ctx, roomID)
if err != nil {
return nil, err
}
defer internal.CloseAndLogIfError(ctx, rows, "SelectRemotePeek: rows.close() failed")
remotePeek := types.RemotePeek{} remotePeek := types.RemotePeek{}
err = rows.Scan( err := row.Scan(
&remotePeek.RoomID, &remotePeek.RoomID,
&remotePeek.ServerName, &remotePeek.ServerName,
&remotePeek.PeekID, &remotePeek.PeekID,
@ -135,7 +131,7 @@ func (s *remotePeeksStatements) SelectRemotePeek(
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &remotePeek, rows.Err() return &remotePeek, nil
} }
func (s *remotePeeksStatements) SelectRemotePeeks( func (s *remotePeeksStatements) SelectRemotePeeks(