Add Utf8view to prepared queries

cutelyst · Oct 3, 2022 · de83c01 · de83c01
1 parent 39fc0a1
commit de83c01
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.16)
-project(libasql VERSION 0.72.0 LANGUAGES CXX)
+project(libasql VERSION 0.73.0 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 

diff --git a/src/apreparedquery.cpp b/src/apreparedquery.cpp
@@ -27,12 +27,28 @@ APreparedQuery::APreparedQuery(QStringView query)
 {
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+APreparedQuery::APreparedQuery(QUtf8StringView query)
+    : m_query(query.data(), query.size())
+    , m_identification(identificationCounter())
+{
+}
+#endif
+
 APreparedQuery::APreparedQuery(QStringView query, QStringView identification)
     : m_query(query.toUtf8())
     , m_identification(identification.toUtf8())
 {
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+APreparedQuery::APreparedQuery(QUtf8StringView query, QUtf8StringView identification)
+    : m_query(query.data(), query.size())
+    , m_identification(identification.data(), identification.size())
+{
+}
+#endif
+
 QByteArray APreparedQuery::query() const
 {
     return m_query;

diff --git a/src/apreparedquery.h b/src/apreparedquery.h
@@ -51,12 +51,28 @@ class ASQL_EXPORT APreparedQuery
      */
     APreparedQuery(QStringView query);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    /*!
+     * \brief APreparedQuery constructs a prepared \p query with an automatic unique identification from UTF-8
+     * \param query
+     */
+    APreparedQuery(QUtf8StringView query);
+#endif
+
     /*!
      * \brief APreparedQuery constructs a prepared \p query with a manual \p identification
      * \param query
      */
     APreparedQuery(QStringView query, QStringView identification);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    /*!
+     * \brief APreparedQuery constructs a prepared \p query with a manual \p identification from UTF-8
+     * \param query
+     */
+    APreparedQuery(QUtf8StringView query, QUtf8StringView identification);
+#endif
+
     QByteArray query() const;
     QByteArray identification() const;