From a26d75006f7c50d4b188a9bc2747a5b02893531c Mon Sep 17 00:00:00 2001
From: mattc <buffless-matt@users.noreply.github.com>
Date: Mon, 21 Mar 2022 12:09:18 +1100
Subject: [PATCH] Alter - Pass through (HTTP) request context to the SQL
queries.
Allow for queries to early-exit if the requests have been aborted.
---
storage/stores/media_store.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/storage/stores/media_store.go b/storage/stores/media_store.go
index af94fe5b..8da29f9c 100644
--- a/storage/stores/media_store.go
+++ b/storage/stores/media_store.go
@@ -537,7 +537,10 @@ func (s *MediaStore) GetUsersUsageStatsForServer(
orderDirection,
limitClause,
offsetClause)
- rows, err := s.factory.sqlDb.Query(paginationQuery, append(commonQueryParams, otherPaginationParams...)...)
+ rows, err := s.factory.sqlDb.QueryContext(
+ s.ctx,
+ paginationQuery,
+ append(commonQueryParams, otherPaginationParams...)...)
if err != nil {
return nil, 0, err
}
@@ -564,7 +567,7 @@ func (s *MediaStore) GetUsersUsageStatsForServer(
") as count_user_ids; ",
commonQueryPortion)
var totalNumRows int64 = 0
- err = s.factory.sqlDb.QueryRow(totalQuery, commonQueryParams...).Scan(&totalNumRows)
+ err = s.factory.sqlDb.QueryRowContext(s.ctx, totalQuery, commonQueryParams...).Scan(&totalNumRows)
if err != nil {
return nil, 0, err
}
--
GitLab