Merge pull request #160 from oblivioncth/dev

Merge to master for v0.7.0.1

Author: oblivioncth

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.23.0...3.31.0)
 # avoided and only used for hotfixes. DON'T USE TRAILING
 # ZEROS IN VERSIONS
 project(Qx
-    VERSION 0.7
+    VERSION 0.7.0.1
     LANGUAGES CXX
     DESCRIPTION "Qt Extensions Library"
 )

lib/sql/include/qx/sql/__private/qx-sqlstring_helpers.h

@@ -56,14 +56,29 @@ void appendKeywordParen(QString& str, const QString& word, const R& range)
     /* The boxing here is inefficient, but I'm not sure how to improve the situation since
      * we rely on the SqlString ctor to reliably get a string from value_type.
      */
-    QString rStr = u"'"_s;
+
+    /* TODO: This is a bit of a hack. We manually quote when the contained type of R is QString
+     * based. This works, but there is an arugment to be made that the caller should be responsible
+     * for ensuring that everything is quoted as required (or is a type that auto quotes) ahead of
+     * time, and this may on occasion cause accidental double quoting.
+     */
+    constexpr bool quote = std::constructible_from<QString, Qx::unwrap<R>>;
+    QString rStr;
+    if constexpr(quote)
+        rStr += u"'"_s;
     for(auto n = std::size(range); const auto& value : range)
     {
         rStr += __private::qstring_compat(value);
         if(n-- != 1)
-            rStr += u"','"_s;
+        {
+            if constexpr(quote)
+                rStr += u"','"_s;
+            else
+                rStr += u","_s;
+        }
     }
-    rStr += u"'"_s;
+    if constexpr(quote)
+        rStr += u"'"_s;
 
     appendKeywordParen(str, word, rStr);
 }

lib/sql/src/qx-sqlquery.cpp

@@ -131,7 +131,7 @@
 /*!
  *  @def QX_SQL_MEMBER_OVERRIDE()
  *
- *  Used to define a member/field specific value parsing/serialzing override for a
+ *  Used to define a member/field specific value parsing/serializing override for a
  *  SQL-tried struct. The specified member will be processed using the provided
  *  functions instead of potentially available generic ones for that type.
  *
@@ -289,7 +289,7 @@ void SqlQuery::bindValue(const QString& placeholder, const QVariant& val) { mBin
 /*!
  *  @fn Derived& AbstractSqlQuery::IN(const R& range)
  *
- *  Adds an `IN` clause to the query using all of the elments from @a range.
+ *  Adds an `IN` clause to the query using all of the elements from @a range.
  *
  *  If @a range is empty, the SQL statement will be ill-formed.
  */