diff options
| author | Kiril Vladimiroff <kiril@vladimiroff.org> | 2020-02-11 16:12:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 14:12:21 +0000 |
| commit | d5dbe546e461261056b5fda1a2ac9fc6d36c69e1 (patch) | |
| tree | fc5f950d5c4e51fe2167239b847c4e6d9b01831b /common/keydb/postgres/server_key_table.go | |
| parent | d45f869cdd35b07ed9b44445732b27935ca1910d (diff) | |
Always defer *sql.Rows.Close and consult with Err (#844)
* Always defer *sql.Rows.Close and consult with Err
database/sql.Rows.Next() makes sure to call Close only after exhausting
result rows which would NOT happen when returning early from a bad Scan.
Close being idempotent makes it a great candidate to get always deferred
regardless of what happens later on the result set.
This change also makes sure call Err() after exhausting Next() and
propagate non-nil results from it as the documentation advises.
Closes #764
Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
* Override named result parameters in last returns
Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
* Do the same over new changes that got merged
Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'common/keydb/postgres/server_key_table.go')
| -rw-r--r-- | common/keydb/postgres/server_key_table.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/keydb/postgres/server_key_table.go b/common/keydb/postgres/server_key_table.go index 8fb9a0ee..6b13cc3c 100644 --- a/common/keydb/postgres/server_key_table.go +++ b/common/keydb/postgres/server_key_table.go @@ -117,7 +117,7 @@ func (s *serverKeyStatements) bulkSelectServerKeys( ExpiredTS: gomatrixserverlib.Timestamp(expiredTS), } } - return results, nil + return results, rows.Err() } func (s *serverKeyStatements) upsertServerKeys( |