Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
222 lines
7.1 KiB
C++
222 lines
7.1 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Template for 'real' structures including insert/update/delete functions for db
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
|
|
// filename: tab_db.h
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <functional>
|
|
#include <QtSql/QSqlError>
|
|
|
|
#include <TrainingAreaBase/tab_export.h>
|
|
#include <TrainingAreaBase/tab_db_structs.h>
|
|
#include <TrainingAreaBase/tab_enums.hpp>
|
|
|
|
|
|
#include </workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/DDS/Core/core.hpp>
|
|
|
|
#include </workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/Services/ProjectDataManagement/pdm.hpp>
|
|
|
|
|
|
namespace NGL
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
class QSqlDatabase;
|
|
|
|
namespace TrainingAreaBase
|
|
{
|
|
|
|
class TAB_COMMON_EXPORT DatabaseInterface : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
virtual ~DatabaseInterface() = default;
|
|
|
|
/**
|
|
* Create a new instance for TrainingAreaBase::DatabaseInterface.
|
|
* @param exerciseId if <= 0 -> global service
|
|
*/
|
|
static std::shared_ptr<DatabaseInterface> create(int exerciseId);
|
|
|
|
/**
|
|
* @brief initialize the database interface (must be called after the db connection was opened!)
|
|
* @return true on succcess
|
|
*/
|
|
virtual bool init(const QSqlDatabase &dbConnection) = 0;
|
|
virtual bool init(const QString &dbUser,
|
|
const QString &dbPasswd,
|
|
const QString &dbDriver,
|
|
const QString &dbHost,
|
|
const QString &dbName) = 0;
|
|
|
|
/**
|
|
* @brief return the current schema name depending if exercise id > 0 or not
|
|
*/
|
|
virtual QString schemaName() const = 0;
|
|
|
|
/**
|
|
* @brief return the current database user dependening if exercise id > 0 or not
|
|
*/
|
|
virtual QString dbUser() const = 0;
|
|
|
|
/**
|
|
* @brief return the database connection used in this DatabaseInterface
|
|
*/
|
|
virtual const QSqlDatabase &database() const = 0;
|
|
|
|
/**
|
|
* emit an error message (ERROR_LOG) when a statement fails to execute (default: on)
|
|
*/
|
|
virtual void setEmitMessageOnError(bool bEmit) = 0;
|
|
|
|
virtual QSqlError getLastError() const = 0;
|
|
|
|
|
|
//
|
|
// Database::AesId2TaId
|
|
//
|
|
public:
|
|
virtual bool insert(Database::AesId2TaId &data) = 0;
|
|
virtual bool upsert(Database::AesId2TaId &data) = 0;
|
|
virtual bool update(const Database::AesId2TaId &data) = 0;
|
|
|
|
virtual bool insert(std::vector<Database::AesId2TaId> &cont) = 0;
|
|
virtual bool upsert(std::vector<Database::AesId2TaId> &cont) = 0;
|
|
virtual bool update(const std::vector<Database::AesId2TaId> &cont) = 0;
|
|
|
|
virtual bool select(QVector<Database::AesId2TaId> &dataVec) = 0;
|
|
virtual bool select(const std::function<void(const Database::AesId2TaId &data)> &cb) = 0;
|
|
virtual bool selectByExerciseId(QVector<Database::AesId2TaId> &dataVec, const qint32 &exerciseId, const QString &orderBy = QString()) = 0;
|
|
virtual bool selectByExerciseId(const std::function<void(const Database::AesId2TaId &data)> &cb, const qint32 &exerciseId, const QString &orderBy = QString()) = 0;
|
|
virtual bool selectAesId2TaId(qint32 aesTetraId, Database::AesId2TaId &data) = 0;
|
|
virtual bool removeAesId2TaId(qint32 aesTetraId) = 0;
|
|
virtual bool removeAesId2TaIdByExerciseId(const qint32 &exerciseId) = 0;
|
|
virtual bool fixUpSequenceAesId2TaId() = 0;
|
|
virtual bool truncateAesId2TaId() = 0;
|
|
|
|
//
|
|
// Database::AesId2TaId end
|
|
//
|
|
|
|
//
|
|
// Database::PrtCnvMember
|
|
//
|
|
public:
|
|
virtual bool insert(Database::PrtCnvMember &data) = 0;
|
|
virtual bool upsert(Database::PrtCnvMember &data) = 0;
|
|
virtual bool update(const Database::PrtCnvMember &data) = 0;
|
|
|
|
virtual bool insert(std::vector<Database::PrtCnvMember> &cont) = 0;
|
|
virtual bool upsert(std::vector<Database::PrtCnvMember> &cont) = 0;
|
|
virtual bool update(const std::vector<Database::PrtCnvMember> &cont) = 0;
|
|
|
|
virtual bool select(QVector<Database::PrtCnvMember> &dataVec) = 0;
|
|
virtual bool select(const std::function<void(const Database::PrtCnvMember &data)> &cb) = 0;
|
|
virtual bool selectPrtCnvMember(qint32 id, Database::PrtCnvMember &data) = 0;
|
|
virtual bool removePrtCnvMember(qint32 id) = 0;
|
|
virtual bool fixUpSequencePrtCnvMember() = 0;
|
|
virtual bool truncatePrtCnvMember() = 0;
|
|
|
|
//
|
|
// Database::PrtCnvMember end
|
|
//
|
|
|
|
//
|
|
// Database::PrtCnvStatus
|
|
//
|
|
public:
|
|
virtual bool insert(Database::PrtCnvStatus &data) = 0;
|
|
virtual bool upsert(Database::PrtCnvStatus &data) = 0;
|
|
virtual bool update(const Database::PrtCnvStatus &data) = 0;
|
|
|
|
virtual bool insert(std::vector<Database::PrtCnvStatus> &cont) = 0;
|
|
virtual bool upsert(std::vector<Database::PrtCnvStatus> &cont) = 0;
|
|
virtual bool update(const std::vector<Database::PrtCnvStatus> &cont) = 0;
|
|
|
|
virtual bool select(QVector<Database::PrtCnvStatus> &dataVec) = 0;
|
|
virtual bool select(const std::function<void(const Database::PrtCnvStatus &data)> &cb) = 0;
|
|
virtual bool selectPrtCnvStatus(qint32 id, Database::PrtCnvStatus &data) = 0;
|
|
virtual bool removePrtCnvStatus(qint32 id) = 0;
|
|
virtual bool fixUpSequencePrtCnvStatus() = 0;
|
|
virtual bool truncatePrtCnvStatus() = 0;
|
|
|
|
//
|
|
// Database::PrtCnvStatus end
|
|
//
|
|
|
|
//
|
|
// Database::PrtCnvToCentral
|
|
//
|
|
public:
|
|
virtual bool insert(Database::PrtCnvToCentral &data) = 0;
|
|
virtual bool upsert(Database::PrtCnvToCentral &data) = 0;
|
|
virtual bool update(const Database::PrtCnvToCentral &data) = 0;
|
|
|
|
virtual bool insert(std::vector<Database::PrtCnvToCentral> &cont) = 0;
|
|
virtual bool upsert(std::vector<Database::PrtCnvToCentral> &cont) = 0;
|
|
virtual bool update(const std::vector<Database::PrtCnvToCentral> &cont) = 0;
|
|
|
|
virtual bool select(QVector<Database::PrtCnvToCentral> &dataVec) = 0;
|
|
virtual bool select(const std::function<void(const Database::PrtCnvToCentral &data)> &cb) = 0;
|
|
virtual bool selectPrtCnvToCentral(qint32 id, Database::PrtCnvToCentral &data) = 0;
|
|
virtual bool removePrtCnvToCentral(qint32 id) = 0;
|
|
virtual bool fixUpSequencePrtCnvToCentral() = 0;
|
|
virtual bool truncatePrtCnvToCentral() = 0;
|
|
|
|
//
|
|
// Database::PrtCnvToCentral end
|
|
//
|
|
|
|
//
|
|
// Database::PrtCnvToRadio
|
|
//
|
|
public:
|
|
virtual bool insert(Database::PrtCnvToRadio &data) = 0;
|
|
virtual bool upsert(Database::PrtCnvToRadio &data) = 0;
|
|
virtual bool update(const Database::PrtCnvToRadio &data) = 0;
|
|
|
|
virtual bool insert(std::vector<Database::PrtCnvToRadio> &cont) = 0;
|
|
virtual bool upsert(std::vector<Database::PrtCnvToRadio> &cont) = 0;
|
|
virtual bool update(const std::vector<Database::PrtCnvToRadio> &cont) = 0;
|
|
|
|
virtual bool select(QVector<Database::PrtCnvToRadio> &dataVec) = 0;
|
|
virtual bool select(const std::function<void(const Database::PrtCnvToRadio &data)> &cb) = 0;
|
|
virtual bool selectPrtCnvToRadio(qint32 id, Database::PrtCnvToRadio &data) = 0;
|
|
virtual bool removePrtCnvToRadio(qint32 id) = 0;
|
|
virtual bool fixUpSequencePrtCnvToRadio() = 0;
|
|
virtual bool truncatePrtCnvToRadio() = 0;
|
|
|
|
//
|
|
// Database::PrtCnvToRadio end
|
|
//
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
// vector of database struct to/from JSON-array
|
|
// helper for BaseDownloader
|
|
template<typename T>
|
|
static QJsonArray toJson(const QVector<T> &dataVec)
|
|
{
|
|
return Database::toJson<T>(dataVec);
|
|
}
|
|
|
|
template<typename T>
|
|
static std::vector<T> fromJson(const QJsonArray &arr)
|
|
{
|
|
return Database::fromJson<T>(arr);
|
|
}
|
|
};// class DatabaseInterface
|
|
|
|
} // namespace TrainingAreaBase
|
|
|