Qxevent

.clang-tidy

@@ -40,6 +40,7 @@ Checks:
     -cppcoreguidelines-pro-type-union-access,
     -cppcoreguidelines-pro-type-vararg,
     -cppcoreguidelines-special-member-functions,
+    -cppcoreguidelines-use-enum-class,
     -hicpp-avoid-c-arrays,
     -hicpp-avoid-goto,
     -hicpp-braces-around-statements,

.github/actions/cmake/action.yml

@@ -66,6 +66,7 @@ runs:
         -B '${{github.workspace}}/build' \
         -DCMAKE_BUILD_TYPE=Release \
         -DQF_BUILD_QML_PLUGINS=ON \
+        -DQF_WITH_LIBSHV=ON \
         -DBUILD_TESTING=OFF \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
         -DUSE_QT6=${{ inputs.use_qt6 }} \

.github/actions/run-linter/action.yml

@@ -20,11 +20,18 @@ runs:
         modules: qtserialport qtmultimedia
         additional_cmake_args: -DCMAKE_GLOBAL_AUTOGEN_TARGET=ON -DCMAKE_AUTOGEN_ORIGIN_DEPENDS=OFF
 
+    # https://bugs.launchpad.net/ubuntu/+source/clazy/+bug/2086665/comments/4
+    - name: Workaround for clazy
+      shell: bash
+      run: |
+        sudo apt-get remove gcc-14
+        sudo apt-get autoremove
+
     # workaround for clang-tidy false positive
     - uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
       if: runner.os == 'Linux'
       with:
-        os: ubuntu-latest
+        os: ubuntu-24.04
 
     - name: Build autogenerated stuff
       shell: bash

.github/workflows/lint.yml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   clang-tidy:
-    name: clang-tidy / Ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: clang-tidy / Ubuntu 24.04
+    runs-on: ubuntu-24.04
     env:
       CC: clang
       CXX: clang++
@@ -26,8 +26,8 @@ jobs:
           exclude_files_pattern: ^quickevent/app/quickevent/plugins/Receipts/src/thirdparty/qrcodegen\.cpp$
 
   clazy:
-    name: clazy / Ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: clazy / Ubuntu 24.04
+    runs-on: ubuntu-24.04
     env:
       CC: clang
       CXX: clang++

.github/workflows/macos.yml

@@ -37,6 +37,7 @@ jobs:
           -B '${{github.workspace}}/build' \
           -DCMAKE_BUILD_TYPE=Release \
           -DQF_BUILD_QML_PLUGINS=ON \
+          -DQF_WITH_LIBSHV=ON \
           -DBUILD_TESTING=OFF \
           -DUSE_QT6=ON \
           -DCOMMIT_SHA=${{ env.COMMIT_SHA }} \

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "3rdparty/necrolog"]
 	path = 3rdparty/necrolog
 	url = https://github.com/fvacek/necrolog.git
+[submodule "3rdparty/libshv"]
+	path = 3rdparty/libshv
+	url = https://github.com/silicon-heaven/libshv.git

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.18.4)
 
 set(QF_BUILD_QML_PLUGINS ON CACHE BOOL "Build with QML Plugins support")
+set(QF_WITH_LIBSHV OFF CACHE BOOL "Build with libshv")
 
 project(quickbox LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 20)
@@ -34,6 +35,9 @@ endif (WIN32)
 if (NOT TARGET libnecrolog)
 	add_subdirectory(3rdparty/necrolog)
 endif()
+if (QF_WITH_LIBSHV)
+	add_subdirectory(3rdparty/libshv)
+endif()
 
 set(USE_QT6 ON)
 find_package(Qt6 REQUIRED COMPONENTS Core Widgets Gui Sql Qml Xml LinguistTools PrintSupport Svg SerialPort Multimedia Network)

libqf/libqfcore/src/sql/qxrecchng.cpp

@@ -48,6 +48,7 @@ QString QxRecChng::recopToString(RecOp op)
 	case RecOp::Update: return "Update";
 	case RecOp::Delete: return "Delete";
 	}
+	return QString();
 }
 
 }

libqf/libqfcore/src/sql/qxsql.cpp

@@ -1,6 +1,8 @@
 #include "qxsql.h"
 
 #include <qf/core/exception.h>
+#include <qf/core/log.h>
+#include <qf/core/sql/query.h>
 
 #include <QSqlQuery>
 #include <QSqlError>
@@ -11,6 +13,49 @@ namespace qf::core::sql {
 //================================================================
 // QxSqlApi
 //================================================================
+namespace {
+
+class Transaction
+{
+public:
+	Transaction(QSqlDatabase db) : m_db(db) {
+		if (!m_db.transaction()) {
+			qfWarning() << "BEGIN transaction error:" << m_db.lastError().text();
+			throw std::runtime_error("BEGIN transaction error");
+		}
+	}
+	~Transaction() {
+		if (m_inTransaction) {
+			m_db.rollback();
+		}
+	}
+	void commit() {
+		if (!m_db.commit()) {
+			qfWarning() << "COMMIT transaction error:" << m_db.lastError().text();
+			throw std::runtime_error("COMMIT transaction error");
+		}
+		m_inTransaction = false;
+	}
+private:
+	QSqlDatabase m_db;
+	bool m_inTransaction = true;
+};
+}
+void QxSqlApi::transaction(const QString &query, const QVariantList &params, QSqlDatabase db)
+{
+	Transaction transaction(db);
+	qf::core::sql::Query q(db);
+	q.prepare(query, qf::core::Exception::Throw);
+	for (const auto &param : params) {
+		auto m = param.toMap();
+		for (const auto &[k, v] : m.asKeyValueRange()) {
+			q.bindValue(':' + k, v);
+		}
+		q.exec(qf::core::Exception::Throw);
+	}
+	transaction.commit();
+}
+
 qint64 QxSqlApi::createRecord(const QString &table, const Record &record, const QString &issuer)
 {
 	Q_UNUSED(issuer)
@@ -63,7 +108,7 @@ bool QxSqlApi::updateRecord(const QString &table, qint64 id, const Record &recor
 			.arg(table, keyVals.join(", "), QString::number(id));
 
 	ExecResult res = exec(qs, record);
-	return res.rowsAffected == 1;
+	return res.numRowsAffected == 1;
 }
 
 bool QxSqlApi::deleteRecord(const QString &table, qint64 id, const QString &issuer)
@@ -72,7 +117,7 @@ bool QxSqlApi::deleteRecord(const QString &table, qint64 id, const QString &issu
 	QString qs = QString("DELETE FROM %1 WHERE id = %2").arg(table, QString::number(id));
 
 	ExecResult res = exec(qs, {});
-	return res.rowsAffected == 1;
+	return res.numRowsAffected == 1;
 }
 
 QList<Record> QxSqlApi::listOneOrMoreRecords(const QString &table, const std::optional<QStringList> &fields, const std::optional<qint64> &id, const std::optional<qint64> &limit)
@@ -106,18 +151,15 @@ QList<Record> QxSqlApi::listOneOrMoreRecords(const QString &table, const std::op
 }
 
 //================================================================
-// QxSql
+// QxSqlApiImpl
 //================================================================
-QxSql::QxSql(const QSqlDatabase &db)
-	: m_db(db)
-{
-
-}
-
-QueryResult QxSql::query(const QString &query, const QVariantMap &params)
+QueryResult QxSqlApiImpl::query(const QString &query, const QVariantMap &params)
 {
+	// qDebug() << query << params;
 	QSqlQuery q(m_db);
-	q.prepare(query);
+	if (!q.prepare(query)) {
+		throw qf::core::Exception(q.lastError().text());
+	}
 	for (const auto &[key, val] : params.asKeyValueRange()) {
 		q.bindValue(QStringLiteral(":%1").arg(key), val);
 	}
@@ -126,7 +168,7 @@ QueryResult QxSql::query(const QString &query, const QVariantMap &params)
 	}
 	QueryResult result;
 	for (int i = 0; i < q.record().count(); ++i) {
-		result.columns.append(q.record().fieldName(i).toLower());
+		result.fields.append(DbField{.name = q.record().fieldName(i).toLower()});
 	}
 	while (q.next()) {
 		QList<QVariant> row;
@@ -138,55 +180,142 @@ QueryResult QxSql::query(const QString &query, const QVariantMap &params)
 	return result;
 }
 
-ExecResult QxSql::exec(const QString &query, const QVariantMap &params)
+ExecResult QxSqlApiImpl::exec(const QString &query, const QVariantMap &params)
 {
 	QSqlQuery q(m_db);
-	q.prepare(query);
+	if (!q.prepare(query)) {
+		throw qf::core::Exception(q.lastError().text());
+	}
 	for (const auto &[key, val] : params.asKeyValueRange()) {
 		q.bindValue(QStringLiteral(":%1").arg(key), val);
 	}
 	if (!q.exec()) {
 		throw qf::core::Exception(q.lastError().text());
 	}
 	ExecResult result;
-	result.rowsAffected = q.numRowsAffected();
+	result.numRowsAffected = q.numRowsAffected();
+	if (auto id = q.lastInsertId().toLongLong(); id > 0) {
+		result.lastInsertId = id;
+	}
 	return result;
 }
 
-qint64 QxSql::createRecord(const QString &table, const Record &record, const QString &issuer)
+void QxSqlApiImpl::transaction(const QString &query, const QVariantList &params)
+{
+	QxSqlApi::transaction(query, params, m_db);
+}
+
+//================================================================
+// QxSql
+//================================================================
+QxSql::QxSql(const QString &issuer, const QSqlDatabase &db, QObject *parent)
+	: QObject(parent)
+	, m_issuer(issuer)
+	, m_sqlApi(db)
 {
-	auto id = QxSqlApi::createRecord(table, record, issuer);
-	emit dbRecChng(qf::core::sql::QxRecChng{.table = table,
+}
+
+QueryResult QxSql::query(const QString &query, const QVariantMap &params)
+{
+	return m_sqlApi.query(query, params);
+}
+
+ExecResult QxSql::exec(const QString &query, const QVariantMap &params)
+{
+	return m_sqlApi.exec(query, params);
+}
+
+QList<Record> QxSql::listRecords(const QString &table, const std::optional<QStringList> &fields, const std::optional<qint64> &fromId, const std::optional<qint64> &limit)
+{
+	return m_sqlApi.listRecords(table, fields, fromId, limit);
+}
+
+void QxSql::transaction(const QString &query, const QVariantList &params)
+{
+	m_sqlApi.transaction(query, params);
+}
+
+qint64 QxSql::createRecord(const QString &table, const Record &record, QObject *source)
+{
+	auto id = m_sqlApi.createRecord(table, record, m_issuer);
+	emit recChng(qf::core::sql::QxRecChng{.table = table,
 										  .id = id,
 										  .record = record,
 										  .op = qf::core::sql::RecOp::Insert,
-										  .issuer = issuer});
+										  .issuer = m_issuer},
+				 source);
 	return id;
 }
 
-bool QxSql::updateRecord(const QString &table, qint64 id, const Record &record, const QString &issuer)
+std::optional<Record> QxSql::readRecord(const QString &table, qint64 id, const std::optional<QStringList> &fields)
 {
-	auto ok = QxSqlApi::updateRecord(table, id, record, issuer);
+	return m_sqlApi.readRecord(table, id, fields);
+}
+
+bool QxSql::updateRecord(const QString &table, qint64 id, const Record &record, QObject *source)
+{
+	auto ok = m_sqlApi.updateRecord(table, id, record, m_issuer);
 	if (ok) {
-		emit dbRecChng(qf::core::sql::QxRecChng{.table = table,
+		emit recChng(qf::core::sql::QxRecChng{.table = table,
 											  .id = id,
 											  .record = record,
 											  .op = qf::core::sql::RecOp::Update,
-											  .issuer = issuer});
+											  .issuer = m_issuer},
+					 source);
 	}
 	return ok;
 }
 
-bool QxSql::deleteRecord(const QString &table, qint64 id, const QString &issuer)
+bool QxSql::deleteRecord(const QString &table, qint64 id, QObject *source)
 {
-	auto ok = QxSqlApi::deleteRecord(table, id, issuer);
+	auto ok = m_sqlApi.deleteRecord(table, id, m_issuer);
 	if (ok) {
-		emit dbRecChng(qf::core::sql::QxRecChng{.table = table,
+		emit recChng(qf::core::sql::QxRecChng{.table = table,
 											  .id = id,
 											  .record = {},
 											  .op = qf::core::sql::RecOp::Delete,
-											  .issuer = issuer});
+											  .issuer = m_issuer},
+					 source);
 	}
 	return ok;
 }
+
+void QxSql::emitRecInserted(const QString &table, qint64 id, const QVariantMap &record, QObject *source)
+{
+	emit recChng(qf::core::sql::QxRecChng{
+		.table = table,
+		.id = id,
+		.record = record,
+		.op = qf::core::sql::RecOp::Insert,
+		.issuer = m_issuer
+	}, source);
+}
+
+void QxSql::emitRecUpdated(const QString &table, qint64 id, const QVariantMap &record, QObject *source)
+{
+	emit recChng(qf::core::sql::QxRecChng{
+		.table = table,
+		.id = id,
+		.record = record,
+		.op = qf::core::sql::RecOp::Update,
+		.issuer = m_issuer
+	}, source);
+}
+
+void QxSql::emitRecDeleted(const QString &table, qint64 id, QObject *source)
+{
+	emit recChng(qf::core::sql::QxRecChng{
+		.table = table,
+		.id = id,
+		.record = {},
+		.op = qf::core::sql::RecOp::Delete,
+		.issuer = m_issuer
+	}, source);
+}
+
+void QxSql::emitRecChng(const core::sql::QxRecChng &recchng, QObject *source)
+{
+	emit recChng(recchng, source);
+}
+
 }