refactor

repertory/librepertory/include/database/db_common.hpp

@@ -57,6 +57,15 @@ struct db_comp_data_t final {
   std::string op_type;
 };
 
+struct db_context_t {
+  db_context_t(sqlite3 &db3_, std::string table_name_)
+      : db3(db3_), table_name(std::move(table_name_)) {}
+  sqlite3 &db3;
+  std::string table_name;
+
+  db3_stmt_t stmt{nullptr};
+};
+
 class db_column final {
 public:
   db_column() noexcept = default;

repertory/librepertory/include/database/db_delete.hpp

@@ -29,19 +29,13 @@
 namespace repertory::db {
 class db_delete final {
 public:
-  struct context final {
+  struct context final : db_context_t {
-    using w_t = db_where_t<context, db_delete>;
-
     context(sqlite3 &db3_, std::string table_name_)
-        : db3(db3_), table_name(std::move(table_name_)) {}
+        : db_context_t(db3_, table_name_) {}
-
+    using w_t = db_where_t<context, db_delete>;
-    sqlite3 &db3;
-    std::string table_name;
 
     std::optional<w_t> where;
     std::vector<db_types_t> where_values;
-
-    db3_stmt_t stmt{nullptr};
   };
 
   using row = db_row<context>;

repertory/librepertory/include/database/db_insert.hpp

@@ -27,16 +27,12 @@
 namespace repertory::db {
 class db_insert final {
 public:
-  struct context final {
+  struct context final : db_context_t {
     context(sqlite3 &db3_, std::string table_name_)
-        : db3(db3_), table_name(std::move(table_name_)) {}
+        : db_context_t(db3_, table_name_) {}
-
-    sqlite3 &db3;
-    std::string table_name;
 
     bool or_replace{false};
     std::map<std::string, db_types_t> values{};
-    db3_stmt_t stmt{nullptr};
   };
 
   using row = db_row<context>;

repertory/librepertory/include/database/db_select.hpp

@@ -29,23 +29,17 @@
 namespace repertory::db {
 class db_select final {
 public:
-  struct context final {
+  struct context final : db_context_t {
     context(sqlite3 &db3_, std::string table_name_)
-        : db3(db3_), table_name(std::move(table_name_)) {}
+        : db_context_t(db3_, table_name_) {}
-
     using w_t = db_where_with_limit_t<context, db_select>;
 
-    sqlite3 &db3;
-    std::string table_name;
-
     std::vector<std::string> columns{};
     std::map<std::string, std::string> count_columns{};
     std::optional<std::int32_t> limit;
     std::optional<std::pair<std::string, bool>> order_by;
     std::optional<w_t> where;
     std::vector<db_types_t> where_values;
-
-    db3_stmt_t stmt{nullptr};
   };
 
   using row = db_row<context>;

repertory/librepertory/include/database/db_update.hpp

@@ -29,21 +29,16 @@
 namespace repertory::db {
 class db_update final {
 public:
-  struct context final {
+  struct context final : db_context_t {
     context(sqlite3 &db3_, std::string table_name_)
-        : db3(db3_), table_name(std::move(table_name_)) {}
+        : db_context_t(db3_, table_name_) {}
     using w_t = db_where_with_limit_t<context, db_update>;
 
-    sqlite3 &db3;
-    std::string table_name;
-
     std::map<std::string, db_types_t> column_values{};
     std::optional<std::int32_t> limit;
     std::optional<std::pair<std::string, bool>> order_by;
     std::optional<w_t> where;
     std::vector<db_types_t> where_values;
-
-    db3_stmt_t stmt{nullptr};
   };
 
   using row = db_row<context>;