From 0175dedcfcae5ae01b369b62d04ce2d5a09c7d13 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Tue, 26 Apr 2022 10:23:04 +0200 Subject: [PATCH] Add comments, close Statement --- syncapi/storage/sqlite3/memberships_table.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/syncapi/storage/sqlite3/memberships_table.go b/syncapi/storage/sqlite3/memberships_table.go index a860be706..e4daa99c1 100644 --- a/syncapi/storage/sqlite3/memberships_table.go +++ b/syncapi/storage/sqlite3/memberships_table.go @@ -70,7 +70,7 @@ type membershipsStatements struct { db *sql.DB upsertMembershipStmt *sql.Stmt selectMembershipCountStmt *sql.Stmt - selectHeroesStmt *sql.Stmt + //selectHeroesStmt *sql.Stmt - prepared at runtime due to variadic } func NewSqliteMembershipsTable(db *sql.DB) (tables.Memberships, error) { @@ -84,7 +84,7 @@ func NewSqliteMembershipsTable(db *sql.DB) (tables.Memberships, error) { return s, sqlutil.StatementList{ {&s.upsertMembershipStmt, upsertMembershipSQL}, {&s.selectMembershipCountStmt, selectMembershipCountSQL}, - {&s.selectHeroesStmt, selectHeroesSQL}, + // {&s.selectHeroesStmt, selectHeroesSQL}, - prepared at runtime due to variadic }.Prepare(db) } @@ -120,10 +120,11 @@ func (s *membershipsStatements) SelectHeroes( ctx context.Context, txn *sql.Tx, roomID, userID string, memberships []string, ) (heroes []string, err error) { stmtSQL := strings.Replace(selectHeroesSQL, "($3)", sqlutil.QueryVariadicOffset(len(memberships), 2), 1) - stmt, err := s.db.Prepare(stmtSQL) + stmt, err := s.db.PrepareContext(ctx, stmtSQL) if err != nil { return } + defer internal.CloseAndLogIfError(ctx, stmt, "SelectHeroes: stmt.close() failed") params := []interface{}{ roomID, userID, }