refactor

support/include/utils/db/sqlite/db_common.hpp

@@ -28,17 +28,13 @@
 namespace repertory::utils::db::sqlite {
 using db_types_t = std::variant<std::int64_t, std::string>;
 
-struct sqlite3_deleter {
-  void operator()(sqlite3 *db3) const {
-    if (db3 != nullptr) {
-      sqlite3_close_v2(db3);
-    }
-  }
+struct sqlite3_deleter final {
+  void operator()(sqlite3 *db3) const;
 };
 
 using db3_t = std::unique_ptr<sqlite3, sqlite3_deleter>;
 
-struct sqlite3_statement_deleter {
+struct sqlite3_statement_deleter final {
   void operator()(sqlite3_stmt *stmt) const {
     if (stmt != nullptr) {
       sqlite3_finalize(stmt);
@@ -104,16 +100,7 @@ public:
   }
 
 #if defined(PROJECT_ENABLE_JSON)
-  [[nodiscard]] auto get_value_as_json() const -> nlohmann::json {
-    return std::visit(
-        overloaded{
-            [this](std::int64_t value) -> auto {
-              return nlohmann::json({{name_, value}});
-            },
-            [](auto &&value) -> auto { return nlohmann::json::parse(value); },
-        },
-        value_);
-  }
+  [[nodiscard]] auto get_value_as_json() const -> nlohmann::json;
 #endif // defined(PROJECT_ENABLE_JSON)
 };
 
@@ -211,7 +198,8 @@ public:
   [[nodiscard]] auto get_error() const -> std::int32_t { return res_; }
 
   [[nodiscard]] auto get_error_str() const -> std::string {
-    return sqlite3_errstr(res_);
+    auto &&err_msg = sqlite3_errstr(res_);
+    return err_msg == nullptr ? std::to_string(res_) : err_msg;
   }
 
   [[nodiscard]] auto get_row(std::optional<db_row<ctx_t>> &row) const -> bool {

support/include/utils/error.hpp

@@ -72,8 +72,7 @@ extern std::atomic<const i_exception_handler *> exception_handler;
 }
 #endif // defined(PROJECT_ENABLE_TESTING)
 
-[[nodiscard]] auto create_error_message(std::string_view function_name,
-                                        std::vector<std::string_view> items)
+[[nodiscard]] auto create_error_message(std::vector<std::string_view> items)
     -> std::string;
 
 void handle_error(std::string_view function_name, std::string_view msg);