Skip to content

Commit f067fa2

Browse files
alexjbaalexjba
committed
fix_: Close sql statements
1 parent 5a9fe3b commit f067fa2

File tree

19 files changed

+77
-9
lines changed

19 files changed

+77
-9
lines changed

‎appdatabase/database.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ func migrateWalletJSONBlobs(sqlTx *sql.Tx) error {
407407
if err != nil {
408408
return err
409409
}
410+
defer stmt.Close()
410411

411412
for _, dataEntry := range batchEntries {
412413
_, err = stmt.Exec(dataEntry...)
@@ -522,6 +523,7 @@ func migrateWalletTransferFromToAddresses(sqlTx *sql.Tx) error {
522523
if err != nil {
523524
return err
524525
}
526+
defer stmt.Close()
525527

526528
for _, dataEntry := range batchEntries {
527529
_, err = stmt.Exec(dataEntry...)

‎appmetrics/database.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ func (db *Database) SaveAppMetrics(appMetrics []AppMetric, sessionID string) (er
139139
if err != nil {
140140
return err
141141
}
142+
defer insert.Close()
142143

143144
for _, metric := range appMetrics {
144145
_, err = insert.Exec(metric.Event, metric.Value, metric.AppVersion, metric.OS, sessionID, metric.Processed)
@@ -243,6 +244,7 @@ func (db *Database) SetToProcessedByIDs(ids []int) (err error) {
243244
if err != nil {
244245
return err
245246
}
247+
defer update.Close()
246248

247249
// Convert the ids into Stmt.Exec compatible variadic
248250
args := make([]interface{}, 0, len(ids))
@@ -296,6 +298,7 @@ func (db *Database) DeleteOlderThan(date *time.Time) (err error) {
296298
if err != nil {
297299
return err
298300
}
301+
defer d.Close()
299302

300303
_, err = d.Exec(date)
301304
if err != nil {

‎multiaccounts/settings/database.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ func (db *Database) saveSetting(setting SettingField, value interface{}) error {
242242
if err != nil {
243243
return err
244244
}
245+
defer update.Close()
245246

246247
_, err = update.Exec(value)
247248

‎protocol/anonmetrics/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ ON CONFLICT (message_id) DO NOTHING;`
8989
if err != nil {
9090
return
9191
}
92+
defer insert.Close()
9293

9394
for _, metric := range appMetrics {
9495
_, err = insert.Exec(

‎protocol/common/messaging_persistence.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ func (c *messagingPersistence) MessageCacheAdd(ids []string, timestamp uint64) (
136136
if err != nil {
137137
return
138138
}
139+
defer stmt.Close()
139140

140141
_, err = stmt.Exec(id, timestamp)
141142
if err != nil {

‎protocol/encryption/multidevice/persistence.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ func (s *sqlitePersistence) GetActiveInstallations(maxInstallations int, identit
2020
if err != nil {
2121
return nil, err
2222
}
23+
defer stmt.Close()
2324

2425
var installations []*Installation
2526
rows, err := stmt.Query(identity, maxInstallations)
@@ -234,6 +235,7 @@ func (s *sqlitePersistence) EnableInstallation(identity []byte, installationID s
234235
if err != nil {
235236
return err
236237
}
238+
defer stmt.Close()
237239

238240
_, err = stmt.Exec(identity, installationID)
239241
return err
@@ -248,7 +250,7 @@ func (s *sqlitePersistence) DisableInstallation(identity []byte, installationID
248250
if err != nil {
249251
return err
250252
}
251-
253+
defer stmt.Close()
252254
_, err = stmt.Exec(identity, installationID)
253255
return err
254256
}
@@ -259,6 +261,7 @@ func (s *sqlitePersistence) SetInstallationMetadata(identity []byte, installatio
259261
if err != nil {
260262
return err
261263
}
264+
defer stmt.Close()
262265

263266
_, err = stmt.Exec(metadata.Name, metadata.DeviceType, metadata.FCMToken, identity, installationID)
264267
return err
@@ -272,6 +275,7 @@ func (s *sqlitePersistence) SetInstallationName(identity []byte, installationID
272275
if err != nil {
273276
return err
274277
}
278+
defer stmt.Close()
275279

276280
_, err = stmt.Exec(name, identity, installationID)
277281
return err

‎protocol/message_persistence.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,6 +1604,8 @@ func (db sqlitePersistence) SaveMessages(messages []*common.Message) (err error)
16041604
return
16051605
}
16061606

1607+
defer stmt.Close()
1608+
16071609
for _, msg := range messages {
16081610
var allValues []interface{}
16091611
allValues, err = db.tableUserMessagesAllValues(msg)
@@ -1692,10 +1694,12 @@ func (db sqlitePersistence) SavePinMessages(messages []*common.PinMessage) (err
16921694
defer func() {
16931695
if err == nil {
16941696
err = queries.transaction.Commit()
1695-
return
1697+
} else {
1698+
// don't shadow original error
1699+
_ = queries.transaction.Rollback()
16961700
}
1697-
// don't shadow original error
1698-
_ = queries.transaction.Rollback()
1701+
queries.updateStmt.Close()
1702+
queries.insertStmt.Close()
16991703
}()
17001704
for _, message := range messages {
17011705
_, err = db.savePinMessage(message, queries)
@@ -1759,10 +1763,12 @@ func (db sqlitePersistence) SavePinMessage(message *common.PinMessage) (inserted
17591763
defer func() {
17601764
if err == nil {
17611765
err = queries.transaction.Commit()
1762-
return
1766+
} else {
1767+
// don't shadow original error
1768+
_ = queries.transaction.Rollback()
17631769
}
1764-
// don't shadow original error
1765-
_ = queries.transaction.Rollback()
1770+
queries.updateStmt.Close()
1771+
queries.insertStmt.Close()
17661772
}()
17671773
return db.savePinMessage(message, queries)
17681774
}
@@ -2281,6 +2287,7 @@ func (db sqlitePersistence) SaveDiscordMessageAuthor(author *protobuf.DiscordMes
22812287
if err != nil {
22822288
return
22832289
}
2290+
defer stmt.Close()
22842291
_, err = stmt.Exec(
22852292
author.GetId(),
22862293
author.GetName(),
@@ -2472,7 +2479,7 @@ func (db sqlitePersistence) SaveEmojiReaction(emojiReaction *EmojiReaction) (err
24722479
if err != nil {
24732480
return
24742481
}
2475-
2482+
defer stmt.Close()
24762483
_, err = stmt.Exec(
24772484
emojiReaction.ID(),
24782485
emojiReaction.Clock,
@@ -2529,6 +2536,7 @@ func (db sqlitePersistence) SaveInvitation(invitation *GroupChatInvitation) (err
25292536
if err != nil {
25302537
return
25312538
}
2539+
defer stmt.Close()
25322540
_, err = stmt.Exec(
25332541
invitation.ID(),
25342542
invitation.From,

‎protocol/persistence.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,8 @@ func (db *sqlitePersistence) AddBookmark(bookmark browsers.Bookmark) (browsers.B
12591259
return bookmark, err
12601260
}
12611261

1262+
defer insert.Close()
1263+
12621264
// Get the right icon
12631265
finder := besticon.IconFinder{}
12641266
icons, iconError := finder.FetchIcons(bookmark.URL)
@@ -1457,6 +1459,8 @@ func (db *sqlitePersistence) UpdateBookmark(oldURL string, bookmark browsers.Boo
14571459
if err != nil {
14581460
return err
14591461
}
1462+
defer insert.Close()
1463+
14601464
_, err = insert.Exec(bookmark.URL, bookmark.Name, bookmark.ImageURL, bookmark.Removed, bookmark.Clock, bookmark.DeletedAt, oldURL)
14611465
return err
14621466
}

‎server/handlers_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func (s *HandlersSuite) saveUserMessage(msg *common.Message) {
8080
`)
8181

8282
s.Require().NoError(err)
83+
defer stmt.Close()
8384

8485
links := []byte{}
8586
statusLinks := []byte{}

‎services/browsers/database.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ func (db *Database) StoreBookmark(bookmark Bookmark) (Bookmark, error) {
7070
if err != nil {
7171
return bookmark, err
7272
}
73+
defer insert.Close()
7374

7475
// Get the right icon
7576
finder := besticon.IconFinder{}
@@ -186,6 +187,7 @@ func (db *Database) UpdateBookmark(originalURL string, bookmark Bookmark) error
186187
if err != nil {
187188
return err
188189
}
190+
defer insert.Close()
189191
_, err = insert.Exec(bookmark.URL, bookmark.Name, bookmark.ImageURL, bookmark.Removed, bookmark.Clock, bookmark.DeletedAt, originalURL)
190192
return err
191193
}

0 commit comments

Comments
 (0)