Conver to using static constructors for string, sqlite, files.

1 files changed, 30 insertions, 6 deletions

diff --git a/include/fud_sqlite.hpp b/include/fud_sqlite.hpp
index d879ed0..c56b4a1 100644
--- a/include/fud_sqlite.hpp
+++ b/include/fud_sqlite.hpp
@@ -21,6 +21,7 @@
 #include <fud_result.hpp>
 #include <fud_status.hpp>
 #include <fud_string.hpp>
+#include <memory>
 #include <sqlite3.h>
 
 namespace fud {
@@ -34,11 +35,19 @@ enum class SqliteOpenMode : int
     ReadWriteCreate = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
 };
 
+class SqliteErrorMsg;
+
+class SqliteDb;
+using SqliteDbResult = Result<SqliteDb, FudStatus>;
+
 class SqliteDb {
+  private:
+    constexpr SqliteDb() = default;
+
   public:
-    SqliteDb(const String& name, SqliteOpenMode mode, int extraFlags = 0);
+    static SqliteDbResult make(const String& name, SqliteOpenMode mode, int extraFlags = 0);
 
-    SqliteDb(const char* name, SqliteOpenMode mode, int extraFlags = 0);
+    static SqliteDbResult make(const char* cStrName, SqliteOpenMode mode, int extraFlags = 0);
 
     SqliteDb(const SqliteDb&) = delete;
 
@@ -58,7 +67,7 @@ class SqliteDb {
         const String& statement,
         int (*callback)(void*, int, char**, char**),
         void* context,
-        String* errorMessage);
+        std::unique_ptr<SqliteErrorMsg> errorMessage);
 
     constexpr int errorCode()
     {
@@ -70,16 +79,15 @@ class SqliteDb {
         return m_dbHandle;
     }
 
-    // private methods
   private:
-    void initialize();
+    // private methods
+    FudStatus initialize();
 
     [[nodiscard]] int open();
 
     Result<SqliteStatement, FudStatus> prepare(const String& sql);
 
     // private data members
-  private:
     String m_name{};
 
     bool m_nameValid{false};
@@ -133,6 +141,22 @@ class SqliteStatement {
     sqlite3_stmt* m_preparedStatement{nullptr};
 };
 
+class SqliteErrorMsg {
+  public:
+    constexpr SqliteErrorMsg() = default;
+    explicit constexpr SqliteErrorMsg(char* errorMsg) : m_errorMsg{errorMsg}
+    {
+    }
+    SqliteErrorMsg(const SqliteErrorMsg&) = delete;
+    SqliteErrorMsg(SqliteErrorMsg&& rhs) noexcept;
+    ~SqliteErrorMsg();
+    SqliteErrorMsg& operator=(const SqliteErrorMsg&) = delete;
+    SqliteErrorMsg& operator=(SqliteErrorMsg&& rhs) noexcept;
+
+  private:
+    char* m_errorMsg{nullptr};
+};
+
 } // namespace fud
 
 #endif