Constructors, destructors, and relevant private fields for SQLiteDatabase/Batch

achow101 · achow101 · commit 5a488b3d7732 · 2020-10-14T11:28:17.000-04:00
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
@@ -4,6 +4,7 @@
 
 #include <wallet/sqlite.h>
 
+#include <logging.h>
 #include <util/memory.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
@@ -17,10 +18,15 @@ static const char* const DATABASE_FILENAME = "wallet.dat";
 SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_path, bool mock)
     : WalletDatabase(), m_mock(mock), m_dir_path(dir_path.string()), m_file_path(file_path.string())
 {
+    LogPrintf("Using SQLite Version %s\n", SQLiteDatabaseVersion());
+    LogPrintf("Using wallet %s\n", m_dir_path);
+
+    Open();
 }
 
 SQLiteDatabase::~SQLiteDatabase()
 {
+    Close();
 }
 
 void SQLiteDatabase::Open()
@@ -46,6 +52,11 @@ std::unique_ptr<DatabaseBatch> SQLiteDatabase::MakeBatch(bool flush_on_close)
     return nullptr;
 }
 
+SQLiteBatch::SQLiteBatch(SQLiteDatabase& database)
+    : m_database(database)
+{
+}
+
 void SQLiteBatch::Close()
 {
 }
diff --git a/src/wallet/sqlite.h b/src/wallet/sqlite.h
@@ -7,6 +7,8 @@
 
 #include <wallet/db.h>
 
+#include <sqlite3.h>
+
 struct bilingual_str;
 class SQLiteDatabase;
 
@@ -23,6 +25,7 @@ class SQLiteBatch : public DatabaseBatch
 
 public:
     explicit SQLiteBatch(SQLiteDatabase& database);
+    ~SQLiteBatch() override { Close(); }
 
     /* No-op. See commeng on SQLiteDatabase::Flush */
     void Flush() override {}
@@ -91,6 +94,8 @@ class SQLiteDatabase : public WalletDatabase
 
     /** Make a SQLiteBatch connected to this database */
     std::unique_ptr<DatabaseBatch> MakeBatch(bool flush_on_close = true) override;
+
+    sqlite3* m_db{nullptr};
 };
 
 bool ExistsSQLiteDatabase(const fs::path& path);

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`#include <wallet/sqlite.h>`
`6`	`6`
	`7`	`+#include <logging.h>`
`7`	`8`	`#include <util/memory.h>`
`8`	`9`	`#include <util/strencodings.h>`
`9`	`10`	`#include <util/translation.h>`
`@@ -17,10 +18,15 @@ static const char* const DATABASE_FILENAME = "wallet.dat";`
`17`	`18`	`SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_path, bool mock)`
`18`	`19`	`: WalletDatabase(), m_mock(mock), m_dir_path(dir_path.string()), m_file_path(file_path.string())`
`19`	`20`	`{`
	`21`	`+ LogPrintf("Using SQLite Version %s\n", SQLiteDatabaseVersion());`
	`22`	`+ LogPrintf("Using wallet %s\n", m_dir_path);`
	`23`	`+`
	`24`	`+ Open();`
`20`	`25`	`}`
`21`	`26`
`22`	`27`	`SQLiteDatabase::~SQLiteDatabase()`
`23`	`28`	`{`
	`29`	`+ Close();`
`24`	`30`	`}`
`25`	`31`
`26`	`32`	`void SQLiteDatabase::Open()`
`@@ -46,6 +52,11 @@ std::unique_ptr<DatabaseBatch> SQLiteDatabase::MakeBatch(bool flush_on_close)`
`46`	`52`	`return nullptr;`
`47`	`53`	`}`
`48`	`54`
	`55`	`+SQLiteBatch::SQLiteBatch(SQLiteDatabase& database)`
	`56`	`+ : m_database(database)`
	`57`	`+{`
	`58`	`+}`
	`59`	`+`
`49`	`60`	`void SQLiteBatch::Close()`
`50`	`61`	`{`
`51`	`62`	`}`