WIP

Author: oblivioncth

lib/sql/CMakeLists.txt

@@ -1,9 +1,15 @@
 #================= Add Component ==========================
 qx_add_component("Sql"
     HEADERS_API
-        qx-common-sql.h
+        qx-sqldatabase.h
+        qx-sqlerror.h
+        qx-sqlquery.h
+        qx-sqlstring.h
     IMPLEMENTATION
-        qx-common-sql.cpp
+        qx-sqldatabase.cpp
+        qx-sqlerror.cpp
+        qx-sqlquery.cpp
+        qx-sqlstring.cpp
     #DOC_ONLY
     LINKS
         PUBLIC

lib/sql/include/qx/sql/qx-common-sql.h

@@ -0,0 +1,99 @@
+#ifndef QX_SQLDATABASE_H
+#define QX_SQLDATABASE_H
+
+// Shared Lib Support
+#include "qx/sql/qx_sql_export.h"
+
+// Qt Includes
+#include <QSqlDatabase>
+#include <QReadWriteLock>
+#include <QUuid>
+
+// Intra-component Includes
+#include "qx/sql/qx-sqlquery.h"
+
+// Extra-component Includes
+
+using namespace Qt::StringLiterals;
+
+class QThread;
+
+namespace Qx
+{
+
+/* Careful use of the thread safe static functions of QSqlDatabase here allow us to avoid
+ * needing our own lock and connection tracker, AND ensure that a lambda can be used to
+ * handle connection closures due to thread-termination without having a potential dangling
+ * reference to the this pointer in the capture, thereby avoiding the overhead of needing
+ * to make this a QObject in order to disconnect when this is destroyed.
+ *
+ * This introduces a small amount of overhead, particularly when it comes to closing all
+ * connections at destruction, but the added simplicity is worth it..
+ */
+
+
+
+class QX_SQL_EXPORT SqlDatabase
+{
+//-Class Variables-----------------------------------------------------------------------------------------------
+private:
+    static inline const QString ID_NAMESPACE = u"Qx::SqlDatabase"_s;
+
+//-Instance Variables-----------------------------------------------------------------------------------------------
+private:
+    // NOTE: These are not const to allow move semantics, but DO NOT write to them after construction, or else this
+    //       isn't thread safe.
+    QString mDatabaseName; /* TODO: Have opt in ctor var for shared connections in the same thread; that is,
+                            * shared instances don't salt their pointer and reuse the same connection as long
+                            * as they're in the same thread, then non-shared instances (default) will only use
+                            * the same connection through the same instance, as is now. Perhaps specify this by
+                            * an optional connection name input that defaults to empty, which will cause this
+                            * class to use the db name as part of the connection name  by default, then if the
+                            * connection name is different, that is used instead of the
+                            */
+    QString mDriver;
+    QString mId;
+
+//-Constructor-------------------------------------------------------------------------------------------------
+public:
+    // TODO: Instead of passing only the driver and db name, allow passing a struct that olds those
+    // and all of the stuff there are setters for in QSqlDatabase so that we can allow full customization
+    // before/at construction time, but dont need to allow setting the values after and therefore don't need
+    // our own mutex.
+    explicit SqlDatabase(const QString& databaseName, const QString& driver);
+    SqlDatabase(const SqlDatabase& other);
+    SqlDatabase(SqlDatabase&& other);
+
+//-Destructor-------------------------------------------------------------------------------------------------
+public:
+    ~SqlDatabase();
+
+//-Class Functions------------------------------------------------------------------------------------------------------
+private:
+    static QString connectionName(QStringView id, const QThread* thread);
+    static void closeConnection(const QString& connectionName);
+    static void closeConnection(QStringView id, const QThread* thread);
+
+//-Instance Functions------------------------------------------------------------------------------------------------------
+private:
+    void closeAllConnections();
+    QString connectionName(const QThread* thread) const;
+
+public:
+    QSqlError database(QSqlDatabase& db);
+
+    // SQL
+    template<typename First, typename ...Rest>
+    SqlDqlQuery SELECT(First&& fs, Rest&&... s) { return SqlDqlQuery(false, *this, std::forward<First>(fs), std::forward<Rest>(s)...); }
+    template<typename First, typename ...Rest>
+    SqlDqlQuery SELECT_DISTINCT(First&& fs, Rest&&... s) { return SqlDqlQuery(true, *this, std::forward<First>(fs), std::forward<Rest>(s)...); }
+
+//-Operators------------------------------------------------------------------------------------------------------
+public:
+    SqlDatabase& operator=(const SqlDatabase& other);
+    SqlDatabase& operator=(SqlDatabase&& other);
+};
+
+}
+
+#endif // QX_SQLDATABASE_H

lib/sql/include/qx/sql/qx-sqldatabase.h

@@ -0,0 +1,56 @@
+#ifndef QX_SQLERROR_H
+#define QX_SQLERROR_H
+
+// Shared Lib Support
+#include "qx/sql/qx_sql_export.h"
+
+// Extra-component Includes
+#include "qx/core/qx-abstracterror.h"
+
+namespace Qx
+{
+
+class QX_SQL_EXPORT SqlError final : public AbstractError<"Qx::SqlError", 7>
+{
+    friend class Db;
+//-Class Enums-------------------------------------------------------------
+public:
+    enum Form
+    {
+        NoError
+    };
+
+//-Class Variables-------------------------------------------------------------
+private:
+    static inline const QHash<Form, QString> ERR_STRINGS{
+        {NoError, u"No error occurred."_s},
+    };
+
+//-Instance Variables-------------------------------------------------------------
+private:
+    Form mForm;
+    QString mCause;
+    QString mDetails;
+
+//-Class Constructor-------------------------------------------------------------
+public:
+    SqlError();
+    SqlError(Form f, const QString& c, const QString& d = {});
+
+//-Instance Functions-------------------------------------------------------------
+private:
+    quint32 deriveValue() const override;
+    QString derivePrimary() const override;
+    QString deriveSecondary() const override;
+    QString deriveDetails() const override;
+
+public:
+    bool isValid() const;
+    Form form() const;
+    QString cause() const;
+    QString details() const;
+};
+
+}
+
+#endif // QX_SQLERROR_H