From f8bb4487df1a5ee81c0f1cb879d8b7af2a101839 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 12 Sep 2020 00:24:22 +0100 Subject: [PATCH] fix sql thinko --- federationsender/storage/sqlite3/remote_peeks_table.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/federationsender/storage/sqlite3/remote_peeks_table.go b/federationsender/storage/sqlite3/remote_peeks_table.go index 19eef880c..0abadc8df 100644 --- a/federationsender/storage/sqlite3/remote_peeks_table.go +++ b/federationsender/storage/sqlite3/remote_peeks_table.go @@ -115,13 +115,9 @@ func (s *remotePeeksStatements) RenewRemotePeek( func (s *remotePeeksStatements) SelectRemotePeek( ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, ) (*types.RemotePeek, error) { - rows, err := sqlutil.TxStmt(txn, s.selectRemotePeeksStmt).QueryContext(ctx, roomID) - if err != nil { - return nil, err - } - defer internal.CloseAndLogIfError(ctx, rows, "SelectRemotePeek: rows.close() failed") + row := sqlutil.TxStmt(txn, s.selectRemotePeeksStmt).QueryRowContext(ctx, roomID) remotePeek := types.RemotePeek{} - err = rows.Scan( + err := row.Scan( &remotePeek.RoomID, &remotePeek.ServerName, &remotePeek.PeekID, @@ -135,7 +131,7 @@ func (s *remotePeeksStatements) SelectRemotePeek( if err != nil { return nil, err } - return &remotePeek, rows.Err() + return &remotePeek, nil } func (s *remotePeeksStatements) SelectRemotePeeks(