Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after - Updated 32 CMakeLists.txt files (Qt5:: → Qt6::) - Tools subdirectory already included in parent Lts/CMakeLists.txt - All 72 tool submodules now present in qt6-migrated-legatus - Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate, DdsView, InfrastructureManagement, and 67 more tools - C++17 standard (RTI 7.7.0 compatibility maintained) - Tests deferred until final validation phase Migration progress: ✅ Lts/Application (68 files) ✅ Lts/DDS (verified Qt6-ready) ✅ Lts/Plugins (60 submodules, verified) ✅ Lts/Projects (5 submodules, verified) ✅ Lts/Proxies (13 submodules, verified) ✅ Lts/Services (47 submodules, verified) ✅ Lts/Tools (72 submodules, copied + CMake updated) ✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap) 🟡 TetraIF (partial) 🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
This commit is contained in:
1 parent
01dce5fe52
commit
d5c13033e2
1792 files changed
+982018
No files matched your search
+202
@@ -0,0 +1,202 @@
|
||||
#ifndef DBCONNECTION_H
|
||||
#define DBCONNECTION_H
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QSqlDatabase>
|
||||
#include <QFile>
|
||||
#include <QSqlError>
|
||||
#include <QSqlQuery>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QDir>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
QSqlDatabase connectToDb() {
|
||||
QString path = QDir::cleanPath(QCoreApplication::applicationDirPath() + QDir::separator() + "../../config" + QDir::separator() + "db_config.json");
|
||||
|
||||
QFile inFile(path);
|
||||
|
||||
if (!inFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
qDebug() << "Kann die Datei nicht öffnen:" << inFile.errorString();
|
||||
}
|
||||
|
||||
QByteArray data = inFile.readAll();
|
||||
inFile.close();
|
||||
|
||||
QJsonParseError errorPtr;
|
||||
|
||||
QJsonDocument doc = QJsonDocument::fromJson(data, &errorPtr);
|
||||
|
||||
if (doc.isNull()) {
|
||||
qDebug() << "Parse failed";
|
||||
}
|
||||
|
||||
QJsonObject rootObj = doc.object();
|
||||
|
||||
QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL");
|
||||
|
||||
db.setHostName(rootObj.value("host").toString());
|
||||
db.setPort(rootObj.value("port").toInt());
|
||||
db.setDatabaseName(rootObj.value("dbname").toString());
|
||||
db.setUserName(rootObj.value("user").toString());
|
||||
db.setPassword(rootObj.value("password").toString());
|
||||
|
||||
if (!db.open()) {
|
||||
qDebug() << "Datenbankverbindung konnte nicht hergestellt werden";
|
||||
return db;
|
||||
}
|
||||
|
||||
qDebug() << "Datenbankverbindung wurde hergestellt";
|
||||
|
||||
return db;
|
||||
}
|
||||
|
||||
QMap<QString, QString> getTableCreationQueries() {
|
||||
QMap<QString, QString> tableQueries;
|
||||
tableQueries["extensions"] = R"(
|
||||
CREATE EXTENSION IF NOT EXISTS postgis;
|
||||
)";
|
||||
|
||||
tableQueries["geojson-seq"] =R"(
|
||||
CREATE SEQUENCE geojson_objects_id_seq;
|
||||
)";
|
||||
// Tabelle für Benutzer
|
||||
tableQueries["users"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id SERIAL PRIMARY KEY,
|
||||
username TEXT NOT NULL UNIQUE,
|
||||
password TEXT NOT NULL
|
||||
)
|
||||
)";
|
||||
|
||||
// Tabelle für Tokens
|
||||
tableQueries["tokens"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS tokens (
|
||||
id SERIAL PRIMARY KEY,
|
||||
user_id INT NOT NULL,
|
||||
token TEXT NOT NULL,
|
||||
created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
||||
expiry_date TIMESTAMP WITHOUT TIME ZONE NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
|
||||
)
|
||||
)";
|
||||
|
||||
// Tabelle für Replays
|
||||
tableQueries["replays"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS replays (
|
||||
uuid TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
created_by INT NOT NULL,
|
||||
time_created BIGINT,
|
||||
FOREIGN KEY (created_by) REFERENCES groups(id) ON DELETE CASCADE
|
||||
)
|
||||
)";
|
||||
|
||||
// Tabelle für Gruppen
|
||||
tableQueries["groups"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS groups (
|
||||
id SERIAL PRIMARY KEY,
|
||||
name TEXT NOT NULL UNIQUE
|
||||
)
|
||||
)";
|
||||
|
||||
// Tabelle für die Zuordnung von Benutzern zu Gruppen
|
||||
tableQueries["user_groups"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS user_groups (
|
||||
user_id INT NOT NULL,
|
||||
group_id INT NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (group_id) REFERENCES groups(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY (user_id, group_id)
|
||||
)
|
||||
)";
|
||||
|
||||
// Tabelle für die Zuordnung von Replays zu Gruppen
|
||||
tableQueries["group_replays"] = R"(
|
||||
CREATE TABLE IF NOT EXISTS group_replays (
|
||||
group_id INT NOT NULL,
|
||||
replay_uuid TEXT NOT NULL,
|
||||
FOREIGN KEY (group_id) REFERENCES groups(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (replay_uuid) REFERENCES replays(uuid) ON DELETE CASCADE,
|
||||
PRIMARY KEY (group_id, replay_uuid)
|
||||
)
|
||||
)";
|
||||
|
||||
// Root-User erstellen (falls nicht bereits vorhanden)
|
||||
tableQueries["root_user"] = R"(
|
||||
INSERT INTO users (username, password)
|
||||
VALUES ('root', '4813494d137e1631bba301d5acab6e7bb7aa74ce1185d456565ef51d737677b2')
|
||||
ON CONFLICT (username) DO NOTHING
|
||||
)";
|
||||
|
||||
// Root-Gruppe erstellen (falls nicht bereits vorhanden)
|
||||
tableQueries["root_group"] = R"(
|
||||
INSERT INTO groups (name)
|
||||
VALUES ('Root')
|
||||
ON CONFLICT (name) DO NOTHING
|
||||
)";
|
||||
|
||||
// Root-User der Root-Gruppe zuordnen
|
||||
tableQueries["root_user_group"] = R"(
|
||||
INSERT INTO user_groups (user_id, group_id)
|
||||
SELECT u.m_id, g.m_id
|
||||
FROM users u, groups g
|
||||
WHERE u.username = 'root' AND g.name = 'Root'
|
||||
ON CONFLICT (user_id, group_id) DO NOTHING
|
||||
)";
|
||||
|
||||
return tableQueries;
|
||||
}
|
||||
|
||||
bool initializeDatabase(QSqlDatabase db) {
|
||||
if (!db.isOpen()) {
|
||||
qDebug() << "Die Datenbank ist nicht geöffnet.";
|
||||
return false;
|
||||
}
|
||||
|
||||
QSqlQuery setupQuery(db);
|
||||
if (!setupQuery.exec(R"(
|
||||
CREATE TABLE IF NOT EXISTS executed_queries (
|
||||
query_name TEXT PRIMARY KEY
|
||||
);
|
||||
)")) {
|
||||
qDebug() << "Fehler beim Erstellen der Tabelle executed_queries:" << setupQuery.lastError().text();
|
||||
return false;
|
||||
}
|
||||
|
||||
QStringList executionOrder = {
|
||||
"extensions", "geojson_seq", "users", "tokens", "replays",
|
||||
"groups", "user_groups", "group_replays", "root_group",
|
||||
"root_user", "root_user_group"
|
||||
};
|
||||
|
||||
QMap<QString, QString> tableQueries = getTableCreationQueries();
|
||||
|
||||
for (const QString& key : executionOrder) {
|
||||
QSqlQuery checkQuery(db);
|
||||
checkQuery.prepare("SELECT 1 FROM executed_queries WHERE query_name = :queryName");
|
||||
checkQuery.bindValue(":queryName", key);
|
||||
|
||||
if (!checkQuery.exec() || !checkQuery.next()) {
|
||||
QSqlQuery execQuery(db);
|
||||
if (!execQuery.exec(tableQueries[key])) {
|
||||
qDebug() << "Fehler beim Ausführen der Query für" << key << ":" << execQuery.lastError().text();
|
||||
return false;
|
||||
}
|
||||
|
||||
QSqlQuery insertQuery(db);
|
||||
insertQuery.prepare("INSERT INTO executed_queries (query_name) VALUES (:queryName)");
|
||||
insertQuery.bindValue(":queryName", key);
|
||||
if (!insertQuery.exec()) {
|
||||
qDebug() << "Fehler beim Einfügen in executed_queries:" << insertQuery.lastError().text();
|
||||
}
|
||||
|
||||
qDebug() << "Query für" << key << "erfolgreich ausgeführt.";
|
||||
}
|
||||
}
|
||||
|
||||
qDebug() << "Datenbank wurde erfolgreich initialisiert.";
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user