From 6636a2608a4e5906ee8092d5731595542261e0ad Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Tue, 16 Jun 2020 14:57:30 -0400
Subject: [PATCH] Implement SQLiteBatch::Close

---
 src/wallet/sqlite.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index 7d96575a643a8..d89508c9df30c 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -182,6 +182,14 @@ SQLiteBatch::SQLiteBatch(SQLiteDatabase& database)
 
 void SQLiteBatch::Close()
 {
+    // If m_db is in a transaction (i.e. not in autocommit mode), then abort the transaction in progress
+    if (m_database.m_db && sqlite3_get_autocommit(m_database.m_db) == 0) {
+        if (TxnAbort()) {
+            LogPrintf("SQLiteBatch: Batch closed unexpectedly without the transaction being explicitly committed or aborted\n");
+        } else {
+            LogPrintf("SQLiteBatch: Batch closed and failed to abort transaction\n");
+        }
+    }
 }
 
 bool SQLiteBatch::ReadKey(CDataStream&& key, CDataStream& value)