aboutsummaryrefslogtreecommitdiff
path: root/federationsender/storage
diff options
context:
space:
mode:
authorKiril Vladimiroff <kiril@vladimiroff.org>2020-02-11 16:12:21 +0200
committerGitHub <noreply@github.com>2020-02-11 14:12:21 +0000
commitd5dbe546e461261056b5fda1a2ac9fc6d36c69e1 (patch)
treefc5f950d5c4e51fe2167239b847c4e6d9b01831b /federationsender/storage
parentd45f869cdd35b07ed9b44445732b27935ca1910d (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 'federationsender/storage')
-rw-r--r--federationsender/storage/postgres/joined_hosts_table.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/federationsender/storage/postgres/joined_hosts_table.go b/federationsender/storage/postgres/joined_hosts_table.go
index bd580e3b..e5c30a01 100644
--- a/federationsender/storage/postgres/joined_hosts_table.go
+++ b/federationsender/storage/postgres/joined_hosts_table.go
@@ -132,5 +132,5 @@ func joinedHostsFromStmt(
})
}
- return result, nil
+ return result, rows.Err()
}