тудаже

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "redkbuild"]
 	path = redkbuild
-	url = git@gitea.redkit-lab.work:redkit-lab/redkbuild.git
+	url = ssh://git@gitea.redkit-lab.work:57322/redkit-lab/redkbuild.git
-[submodule "redkitty"]
-	path = redkitty
-	url = git@gitea.redkit-lab.work:redkit-lab/redkitty.git

prerequisites/qbs/imports/SQLiteArtifactsExport.qbs

@@ -1,8 +0,0 @@
-import qbs
-
-Export {
-    Depends { name: "cpp" }
-    Depends { name: "rsc.sqlite.settings" }
-
-    rsc.sqlite.settings.includeRegexValues: exportingProduct.includeRegexValue
-}

prerequisites/qbs/modules/karchive/karchive.qbs

@@ -1,53 +0,0 @@
-import qbs
-
-Module {
-    id: karchive
-
-    readonly property string karchive_path: project.sourceDirectory + "/external_libs/karchive"
-    readonly property string libKF5ArchivePath: karchive.karchive_path + "/lib"
-                                                + (qbs.buildVariant == "release" ? "/Release" : "/Debug")
-    property bool installFiles: true
-
-    Depends { name: "glob" }
-    Depends { name: "cpp" }
-    Depends { name: "zlib" }
-
-    Properties
-    {
-        condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra")
-        cpp.includePaths: [ karchive.karchive_path + "/include/lin" ]
-        cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/lin" ]
-        cpp.dynamicLibraries: "KF5Archive"
-    }
-
-    Properties {
-        condition: qbs.targetOS.contains("windows")
-        cpp.includePaths: [ karchive.karchive_path + "/include/win" ]
-        cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/win" ]
-        cpp.dynamicLibraries: "KF5Archive"
-    }
-
-    InstallGroup {
-        name: "karchive_lin"
-        condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra")
-        files: [
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so",
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5",
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5.108.0"
-        ]
-        qbs.install: karchive.installFiles
-        qbs.installDir: glob.binInstallPrefix
-    }
-
-    InstallGroup {
-        name: "karchive_win"
-        condition: qbs.targetOS.contains("windows")
-        files: [
-            karchive.libKF5ArchivePath + "/win/KF5Archive.dll",
-            karchive.libKF5ArchivePath + "/win/KF5Archive.lib"
-        ]
-        qbs.install: karchive.installFiles
-        qbs.installDir: glob.binInstallPrefix
-    }
-    zlib.installFiles: true
-}

project.qbs

@@ -3,19 +3,19 @@ import qbs
 Project {
     name: "opds++"
     qbsSearchPaths: [
-        "redkitty/qbs",
+        "qbs",
+        // "redkitty/qbs",
+        // // "guiness/qbs",
+        // // "prerequisites/qbs",
+        // // "report/qbs",
         "redkbuild",
-        "redkitty/lib/redkit-gen-integration/qbs",
+        // // "ext_libs/openssl/qbs",
-        "prerequisites/qbs",
+        // "redkitty/lib/redkit-gen-integration/qbs",
     ]
 
     references: [
-        "redkitty/lib/rsc/libs_impl/rdbaseimpl/rdbaseimpl.qbs",
-        "redkitty/lib/rcore/rcore.qbs",
-
         "src/cpp-opds.qbs",
         "src/database/database.qbs",
-        "src/model/model.qbs",
         "src/restapi/restapi.qbs",
     ]
 }

qbs/modules/odbModule/odbModule.qbs

@@ -0,0 +1,65 @@
+import qbs
+import qbs.FileInfo
+
+Module {
+    Depends { name: "cpp" }
+    Depends { name: "Qt.core" }
+
+    FileTagger {
+        patterns: "*.hxx"
+        fileTags: ["odb"]
+    }
+
+    Rule {
+        inputs: ["odb"]
+        Artifact {
+            // filePath: FileInfo.baseName(input.fileName)+ "-odb.hxx"
+            filePath: FileInfo.cleanPath(input.filePath + "/../" ) + "/" + FileInfo.baseName(input.fileName) + "-odb.hxx"
+            fileTags: ["hpp"]
+        }
+        Artifact {
+            // filePath: FileInfo.baseName(input.fileName) + "-odb.cxx"
+            filePath: {
+                // console.error("THIS ART "+FileInfo.cleanPath(input.filePath + "/../") + "/" + FileInfo.baseName(input.fileName) + "-odb.cxx")
+                return FileInfo.cleanPath(input.filePath + "/../") + "/" + FileInfo.baseName(input.fileName) + "-odb.cxx"}
+            fileTags: ["cpp"]
+        }
+
+        prepare: {
+            var cmd = new Command("odb", [
+                "--std", "c++11",
+                "-d", "sqlite",
+                "--generate-query",
+                "--generate-schema",
+                "--generate-prepared",
+                // "--include-prefix", FileInfo.cleanPath(input.filePath + "/../"),
+                // "--output-dir", product.Qt.core.qmDir,
+                "--output-dir", FileInfo.cleanPath(input.filePath + "/../"),
+                "-I/home/uzver/qt5.15/include",
+                input.filePath,
+            ]);
+            cmd.description = "Generating ODB files for " + input.fileName;
+
+            console.error(cmd.arguments)
+
+            return [cmd];
+        }
+    }
+
+    cpp.includePaths: [
+        project.sourceDirectory,
+        product.Qt.core.qmDir,
+        "/usr/include", // Общие заголовки
+        "/usr/include/odb" // Заголовки ODB
+    ]
+
+    // Подключаем библиотеки ODB
+    cpp.libraryPaths: [
+        "/usr/lib" // Путь к библиотекам
+    ]
+
+    cpp.dynamicLibraries: [
+        "odb",
+        "odb-sqlite"
+    ]
+}

src/cpp-opds.qbs

@@ -3,7 +3,7 @@
     \inherits Project
     \brief Описание
 */
-PSApplication {
+Application {
     // CppApplication {
         cpp.defines: [
             // You can make your code fail to compile if it uses deprecated APIs.
@@ -16,12 +16,9 @@ PSApplication {
         Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
         Depends { name: "cpp" }
         Depends { name: "database" }
-        Depends { name: "odb.gen" }
+        Depends { name: "odbModule"}
-        Depends { name: "sqlite3" }
+
-        Depends { name: "restapi" }
+        // Depends { name: "redkit_gen" }
-        Depends { name: "redkit_gen" }
-        Depends { name: "rdbase" }
-        Depends { name: "model" }
 
         cpp.cxxLanguageVersion: "c++20"
 
@@ -32,12 +29,6 @@ PSApplication {
             ]
         }
 
-        cpp.dynamicLibraries: [
-            "odb-sqlite",
-            "odb-qt",
-            "odb",
-            "sqlite3"
-        ]
 
     // }
 } // Project

src/database/author_s.h

@@ -4,48 +4,49 @@
 #ifndef AUTHOR_S_H
 #define AUTHOR_S_H
 
-#include "model_global.h"
+// #include <QtCore/QObject>
 
-#include <QString>
+#include <cstddef> // std::size_t
+#include <memory>
+#include <string>
 
 #include <odb/core.hxx>
 #include <odb/database.hxx>
 #include <odb/query.hxx>
 
 #pragma db object
-class MODEL_EXPORT Author_S
+class __attribute__((visibility("default"))) Author_S
 {
 public:
     Author_S() = default;
 
-    Author_S(const QString& firstN,
+    Author_S(const std::string& first,
-             const QString& lastN,
+             const std::string& last,
              const unsigned short age) :
-        m_firstName(firstN),
+        m_first(first),
-        m_lastName(lastN),
+        m_last(last),
         m_age(age)
     {
     }
 
     unsigned long long id() const { return m_id; }
-    QString firstName() const { return m_firstName; }
+    std::string first() const { return m_first; }
-    QString lastName() const { return m_lastName; }
+    std::string last() const { return m_last; }
     unsigned short age() const { return m_age; }
 
-    QString full_name() const { return m_firstName + " " + m_lastName; }
+    std::string full_name() const { return m_first + " " + m_last; }
 
     void age(unsigned short age) { m_age = age; }
 
 private:
     friend class odb::access;
 
-private:
 #pragma db id auto
-    quint64 m_id;
+    unsigned long long m_id;
 
-    QString m_firstName;
+    std::string m_first;
-    QString m_lastName;
+    std::string m_last;
-    quint64 m_age;
+    unsigned short m_age;
 };
 
 #pragma db view object(Author_S)

src/database/book_s.h

@@ -0,0 +1,48 @@
+// file      : hello/person.hxx
+// copyright : not copyrighted - public domain
+
+#ifndef BOOK_S_H
+#define BOOK_S_H
+
+// #include <QtCore/QObject>
+
+#include <memory>
+#include <string>
+
+#include <odb/core.hxx>
+
+#include "author_s.h"
+
+#pragma db object
+class __attribute__((visibility("default"))) Book_S
+{
+public:
+    Book_S() = default;
+
+    Book_S(const std::string& name,
+           const std::shared_ptr<Author_S>& author,
+           const int year)
+    {
+        m_author = author;
+        m_name = name;
+        m_year = year;
+    };
+
+    unsigned long long id() const { return m_id; }
+    std::shared_ptr<Author_S> author() const { return m_author; }
+    std::string name() const { return m_name; }
+    int year() const { return m_year; }
+
+private:
+    friend class odb::access;
+
+private:
+#pragma db id auto
+    unsigned long long m_id;
+
+    std::shared_ptr<Author_S> m_author;
+    std::string m_name;
+    int m_year;
+};
+
+#endif // BOOK_S_H

src/database/database.hxx

@@ -13,27 +13,99 @@
 #include <memory> // std::unique_ptr
 #include <string>
 
+#include <odb/database.hxx>
+
+#if defined(DATABASE_MYSQL)
+#include <odb/mysql/database.hxx>
+#elif defined(DATABASE_SQLITE)
+#include <odb/connection.hxx>
+#include <odb/schema-catalog.hxx>
+#include <odb/sqlite/database.hxx>
+#include <odb/transaction.hxx>
+#elif defined(DATABASE_PGSQL)
+#include <odb/pgsql/database.hxx>
+#elif defined(DATABASE_ORACLE)
+#include <odb/oracle/database.hxx>
+#elif defined(DATABASE_MSSQL)
+#include <odb/mssql/database.hxx>
+#else
+#error unknown database; did you forget to define the DATABASE_* macros?
+#endif
+
 #include <filesystem>
+#include <random>
 
-#include "database_utils.h"
+struct testData
+{
+    std::string first;
+    std::string last;
+    int age;
+};
 
-inline uDBase openDB(const std::string path_db)
+// Функция для генерации случайной строки (имени или фамилии)
+std::string generate_random_string(const std::vector<std::string>& pool)
+{
+    static std::random_device rd;
+    static std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(0, pool.size() - 1);
+    return pool[dis(gen)];
+}
+
+// Функция для генерации случайного года
+int generate_random_year(int min_year = 1900, int max_year = 2020)
+{
+    static std::random_device rd;
+    static std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(min_year, max_year);
+    return dis(gen);
+}
+
+std::vector<testData> fillDB()
+{
+    std::vector<std::string> first_names = {
+        "John", "Jane", "Alex", "Chris", "Robert", "Emily", "James", "Linda", "David", "Sarah",
+        "Michael", "Elizabeth", "Daniel", "Samantha", "William", "Olivia", "Ethan", "Sophia", "Joshua", "Charlotte",
+        "Daniel", "Grace", "Benjamin", "Isabella", "Matthew", "Victoria", "Henry", "Abigail", "Samuel", "Megan",
+        "Lucas", "Lily", "Andrew", "Madison", "Jackson", "Chloe", "Aiden", "Amelia", "Thomas", "Natalie",
+        "Ryan", "Zoe", "Jack", "Harper", "Elijah", "Ava", "Isaac", "Mia", "Caleb", "Ella"
+    };
+    std::vector<std::string> last_names = {
+        "Doe", "Smith", "Johnson", "Williams", "Jones", "Brown", "Davis", "Miller", "Wilson", "Moore",
+        "Taylor", "Anderson", "Thomas", "Jackson", "White", "Harris", "Martin", "Thompson", "Garcia", "Martinez",
+        "Roberts", "Clark", "Lewis", "Walker", "Young", "Allen", "King", "Wright", "Scott", "Adams",
+        "Baker", "Gonzalez", "Nelson", "Carter", "Mitchell", "Perez", "Robinson", "Hughes", "Flores", "Cook",
+        "Rogers", "Gutierrez", "Ramirez", "Diaz", "Perez", "Ross", "Sanders", "Price", "Howard", "Cooper"
+    };
+
+    std::vector<testData> vecTest;
+
+    for (int i = 0; i < 50; ++i)
+    {
+        std::string first_name = generate_random_string(first_names);
+        std::string last_name = generate_random_string(last_names);
+        int birth_year = generate_random_year(1900, 2000);
+
+        vecTest.push_back({ first_name, last_name, birth_year });
+    }
+
+    return vecTest;
+}
+
+inline std::unique_ptr<odb::database> openDB(std::string path_db)
 {
     // Открыть БД, если она существует
-    auto db_ptr = new oDBase(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
-
     if (std::filesystem::is_regular_file(path_db))
-        return uDBase(db_ptr);
+        return std::unique_ptr<odb::core::database>(new odb::sqlite::database(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
 
     // И создать новую, если не существует
-    uDBase db(db_ptr);
+    std::unique_ptr<odb::core::database> db(new odb::sqlite::database(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
 
-    odb::connection_ptr connect_ptr(db->connection());
+    odb::core::connection_ptr connect_ptr(db->connection());
 
     connect_ptr->execute("PRAGMA foreign_keys=OFF");
 
-    odb::transaction tans(db->begin());
+    odb::core::transaction tans(db->begin());
-    odb::schema_catalog::create_schema(*db);
+    odb::core::schema_catalog::create_schema(*db);
     tans.commit();
 
     connect_ptr->execute("PRAGMA foreign_keys=ON");

src/database/database.qbs

@@ -8,33 +8,45 @@ PSLibrary {
         // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
         //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
-        "DATABASE_SQLITE",
+        "DATABASE_SQLITE"
-        "DATABASE_LIBRARY"
     ]
     consoleApplication: true
 
-    Depends { name: "Qt"; submodules: [ "core", "network" ] }
+    Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
     Depends { name: "cpp" }
+    Depends { name: "odbModule"}
 
-    Depends { name: "odb.gen" }
+    cpp.cxxLanguageVersion: "c++20"
-    Depends { name: "rdbase" }
-
-    odb.gen.databases: "sqlite"
-    cpp.cxxLanguageVersion: "c++17"
 
     Group {
         name: "cpp"
         files: [
-            "**/*.h",
+            "books.*",
-            "**/*.hxx",
+            "databasemanager.*",
-            "**/*.cpp",
         ]
     }
 
+    Group {
+        name: "odb"
+        files: [
+            "author_s.h",
+            "book_s.h",
+        ]
+        fileTags: ["odb"]
+    }
+
+    cpp.includePaths: [
+        "/usr/include", // Общие заголовки
+        "/usr/include/odb" // Заголовки ODB
+    ]
+
+    // Подключаем библиотеки ODB
+    cpp.libraryPaths: [
+        "/usr/lib" // Путь к библиотекам
+    ]
+
     cpp.dynamicLibraries: [
-        "odb-sqlite",
-        "odb-qt",
         "odb",
-        "sqlite3"
+        "odb-sqlite"
     ]
 }

src/database/database_global.h

@@ -1,12 +0,0 @@
-#ifndef DATABASE_GLOBAL_H
-#define DATABASE_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(DATABASE_LIBRARY)
-#define DATABASE_EXPORT Q_DECL_EXPORT
-#else
-#define DATABASE_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // DATABASE_GLOBAL_H

src/database/database_utils.cpp

@@ -1,57 +0,0 @@
-#include "database_utils.h"
-
-#include <random>
-
-namespace
-{
-
-// Функция для генерации случайной строки (имени или фамилии)
-QString generate_random_string(const QVector<QString>& pool)
-{
-    static std::random_device rd;
-    static std::mt19937 gen(rd());
-    std::uniform_int_distribution<> dis(0, pool.size() - 1);
-    return pool[dis(gen)];
-}
-
-// Функция для генерации случайного года
-int generate_random_year(int min_year = 1900, int max_year = 2020)
-{
-    static std::random_device rd;
-    static std::mt19937 gen(rd());
-    std::uniform_int_distribution<> dis(min_year, max_year);
-    return dis(gen);
-}
-
-} // namespace
-
-QVector<testData> fillAuthorDB()
-{
-    QVector<QString> first_names = {
-        "John", "Jane", "Alex", "Chris", "Robert", "Emily", "James", "Linda", "David", "Sarah",
-        "Michael", "Elizabeth", "Daniel", "Samantha", "William", "Olivia", "Ethan", "Sophia", "Joshua", "Charlotte",
-        "Daniel", "Grace", "Benjamin", "Isabella", "Matthew", "Victoria", "Henry", "Abigail", "Samuel", "Megan",
-        "Lucas", "Lily", "Andrew", "Madison", "Jackson", "Chloe", "Aiden", "Amelia", "Thomas", "Natalie",
-        "Ryan", "Zoe", "Jack", "Harper", "Elijah", "Ava", "Isaac", "Mia", "Caleb", "Ella"
-    };
-    QVector<QString> last_names = {
-        "Doe", "Smith", "Johnson", "Williams", "Jones", "Brown", "Davis", "Miller", "Wilson", "Moore",
-        "Taylor", "Anderson", "Thomas", "Jackson", "White", "Harris", "Martin", "Thompson", "Garcia", "Martinez",
-        "Roberts", "Clark", "Lewis", "Walker", "Young", "Allen", "King", "Wright", "Scott", "Adams",
-        "Baker", "Gonzalez", "Nelson", "Carter", "Mitchell", "Perez", "Robinson", "Hughes", "Flores", "Cook",
-        "Rogers", "Gutierrez", "Ramirez", "Diaz", "Perez", "Ross", "Sanders", "Price", "Howard", "Cooper"
-    };
-
-    QVector<testData> vecTest;
-
-    for (int i = 0; i < 50; ++i)
-    {
-        QString first_name = generate_random_string(first_names);
-        QString last_name = generate_random_string(last_names);
-        int birth_year = generate_random_year(1900, 2000);
-
-        vecTest.push_back({ first_name, last_name, birth_year });
-    }
-
-    return vecTest;
-}

src/database/database_utils.h

@@ -1,37 +0,0 @@
-#include <QString>
-#include <QVector>
-
-#include <odb/database.hxx>
-
-#if defined(DATABASE_MYSQL)
-#include <odb/mysql/database.hxx>
-#elif defined(DATABASE_SQLITE)
-#include <odb/connection.hxx>
-#include <odb/schema-catalog.hxx>
-#include <odb/sqlite/database.hxx>
-#include <odb/transaction.hxx>
-#elif defined(DATABASE_PGSQL)
-#include <odb/pgsql/database.hxx>
-#elif defined(DATABASE_ORACLE)
-#include <odb/oracle/database.hxx>
-#elif defined(DATABASE_MSSQL)
-#include <odb/mssql/database.hxx>
-#else
-#error unknown database; did you forget to define the DATABASE_* macros?
-#endif
-
-#include <rcore/smarttypes.h>
-
-#include "database_global.h"
-
-using oDBase = odb::sqlite::database;
-using uDBase = U<oDBase>;
-
-struct testData
-{
-    QString first;
-    QString last;
-    int age;
-};
-
-QVector<testData> DATABASE_EXPORT fillAuthorDB();

src/database/databasemanager.cpp

@@ -0,0 +1,118 @@
+#include "databasemanager.h"
+
+// Singleton instance
+DatabaseManager& DatabaseManager::instance()
+{
+    static DatabaseManager instance;
+    return instance;
+}
+
+// Конструктор: создаем подключение
+DatabaseManager::DatabaseManager()
+{
+    db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName("mydatabase.db");
+
+    if (!db.open())
+    {
+        qDebug() << "Ошибка открытия БД:" << db.lastError().text();
+    }
+    else
+    {
+        qDebug() << "База данных успешно открыта";
+    }
+}
+
+// Деструктор: закрываем подключение
+DatabaseManager::~DatabaseManager()
+{
+    if (db.isOpen())
+    {
+        db.close();
+    }
+}
+
+// Возвращает ссылку на объект БД
+QSqlDatabase& DatabaseManager::database()
+{
+    return db;
+}
+
+// Выполняет SQL-запрос (без параметров)
+bool DatabaseManager::executeQuery(const QString& query)
+{
+    QSqlQuery q;
+    if (!q.exec(query))
+    {
+        qDebug() << "Ошибка выполнения запроса:" << q.lastError().text();
+        return false;
+    }
+    return true;
+}
+
+// Выполняет подготовленный SQL-запрос с параметрами
+bool DatabaseManager::executePreparedQuery(const QString& query, const QStringList& values)
+{
+    QSqlQuery q;
+    q.prepare(query);
+
+    for (const auto& value : values)
+        q.addBindValue(value);
+
+    if (!q.exec())
+    {
+        qDebug() << "Ошибка выполнения подготовленного запроса:" << q.lastError().text();
+        return false;
+    }
+    return true;
+}
+
+QList<QVariantList> DatabaseManager::executeSelectQuery(const QString& query, const QStringList& values)
+{
+    QSqlQuery q;
+    q.prepare(query);
+
+    for (const auto& value : values)
+        q.addBindValue(value);
+
+    if (!q.exec())
+    {
+        qDebug() << "Ошибка выполнения SELECT запроса:" << q.lastError().text();
+        return {};
+    }
+
+    QList<QVariantList> results;
+    while (q.next())
+    {
+        QVariantList row;
+        for (int i = 0; i < q.record().count(); ++i)
+            row.append(q.value(i));
+        results.append(row);
+    }
+
+    return results;
+}
+
+QList<QVariantList> DatabaseManager::executeSelect(const SelectBuilder& selectBuilder)
+{
+    const auto queryString = selectBuilder.getSelect();
+    qDebug() << "Подготовленный запрос: " << queryString;
+
+    QSqlQuery q;
+    if (!q.prepare(queryString))
+        qDebug() << "Ошибка при подготовке запроса:" << q.lastError().text();
+
+    if (!q.exec())
+        qDebug() << "Ошибка при выполнении запроса:" << q.lastError().text();
+
+    QList<QVariantList> results;
+    while (q.next()) // Проходимся по строкам
+    {
+        QVariantList row;
+        for (int i = 0; i < q.record().count(); ++i) // Проходимся по столбцам
+            row.append(q.value(i));
+        results.append(row);
+    }
+
+    return results;
+}

src/database/databasemanager.h

@@ -0,0 +1,59 @@
+#ifndef DATABASEMANAGER_H
+#define DATABASEMANAGER_H
+
+#include <QDebug>
+#include <QtSql>
+
+struct SelectBuilder
+{
+    QString tableName;
+    QStringList rows = { "*" };
+    QString where;
+
+    QString getSelect() const
+    {
+        QString allRows;
+
+        auto ri = rows.begin();
+        while (ri != rows.end())
+        {
+            allRows += (*ri++);
+
+            if (ri != rows.end())
+                allRows += ", ";
+        }
+
+        QString queryString = QString("SELECT %1").arg(allRows);
+
+        queryString += QString(" FROM %1").arg(tableName);
+
+        if (!where.isEmpty())
+            queryString += QString(" WHERE %1").arg(where);
+
+        queryString += ';';
+        return queryString;
+    }
+};
+
+class Q_DECL_EXPORT DatabaseManager
+{
+public:
+    static DatabaseManager& instance(); // Singleton
+
+    QSqlDatabase& database();
+
+    bool executeQuery(const QString& query);
+    bool executePreparedQuery(const QString& query, const QStringList& values);
+
+    QList<QVariantList> executeSelectQuery(const QString& query, const QStringList& values = {});
+
+    QList<QVariantList> executeSelect(const SelectBuilder& selectBuilder);
+
+private:
+    DatabaseManager();
+    ~DatabaseManager();
+
+    QSqlDatabase db;
+};
+
+#endif // DATABASEMANAGER_H

src/main.cpp

@@ -1,50 +1,47 @@
 #include <QCoreApplication>
 
-#include <QPointer>
-#include <QSharedPointer>
-#include <QString>
-#include <QVector>
-
 #include <restapi/restapiserver.h>
 
 /* Опыты с odb */
-#include <model/author_s-odb.hxx> // Должен быть здесь
+#include <database/author_s-odb.hxx> // Должен быть здесь
-#include <model/author_s.h>
+#include <database/author_s.h>
-#include <model/book_s-odb.hxx> // Должен быть здесь
+#include <database/book_s-odb.hxx> // Должен быть здесь
-#include <model/book_s.h>
+#include <database/book_s.h>
 #include <database/database.hxx> // create_database
 #include <odb/database.hxx>
 
 #include <iostream>
 
-void fillBooksBD(uDBase& db)
+using unidb = std::unique_ptr<odb::database>;
+
+void fillBooksBD(unidb& db)
 {
     try
     {
-        QVector<SH<Author_S>> authors = {
+        std::vector<std::shared_ptr<Author_S>> authors = {
-            SH<Author_S>::create("George", "Orwell", 142),
+            std::make_shared<Author_S>("George", "Orwell", 142),
-            SH<Author_S>::create("J.K.", "Rowling", 56),
+            std::make_shared<Author_S>("J.K.", "Rowling", 56),
-            SH<Author_S>::create("J.R.R.", "Tolkien", 81),
+            std::make_shared<Author_S>("J.R.R.", "Tolkien", 81),
-            SH<Author_S>::create("Leo", "Tolstoy", 189),
+            std::make_shared<Author_S>("Leo", "Tolstoy", 189),
-            SH<Author_S>::create("Fyodor", "Dostoevsky", 174),
+            std::make_shared<Author_S>("Fyodor", "Dostoevsky", 174),
-            SH<Author_S>::create("Mark", "Twain", 183),
+            std::make_shared<Author_S>("Mark", "Twain", 183),
-            SH<Author_S>::create("Charles", "Dickens", 208),
+            std::make_shared<Author_S>("Charles", "Dickens", 208),
-            SH<Author_S>::create("Virginia", "Woolf", 134),
+            std::make_shared<Author_S>("Virginia", "Woolf", 134),
-            SH<Author_S>::create("Ernest", "Hemingway", 122),
+            std::make_shared<Author_S>("Ernest", "Hemingway", 122),
-            SH<Author_S>::create("Gabriel", "García Márquez", 98),
+            std::make_shared<Author_S>("Gabriel", "García Márquez", 98),
-            SH<Author_S>::create("Franz", "Kafka", 100),
+            std::make_shared<Author_S>("Franz", "Kafka", 100),
-            SH<Author_S>::create("Harper", "Lee", 64),
+            std::make_shared<Author_S>("Harper", "Lee", 64),
-            SH<Author_S>::create("William", "Shakespeare", 459),
+            std::make_shared<Author_S>("William", "Shakespeare", 459),
-            SH<Author_S>::create("Oscar", "Wilde", 155),
+            std::make_shared<Author_S>("Oscar", "Wilde", 155),
-            SH<Author_S>::create("Aldous", "Huxley", 123),
+            std::make_shared<Author_S>("Aldous", "Huxley", 123),
-            SH<Author_S>::create("Jane", "Austen", 210),
+            std::make_shared<Author_S>("Jane", "Austen", 210),
-            SH<Author_S>::create("John", "Steinbeck", 116),
+            std::make_shared<Author_S>("John", "Steinbeck", 116),
-            SH<Author_S>::create("Agatha", "Christie", 124),
+            std::make_shared<Author_S>("Agatha", "Christie", 124),
-            SH<Author_S>::create("Isaac", "Asimov", 105)
+            std::make_shared<Author_S>("Isaac", "Asimov", 105)
         };
 
         // Список книг
-        QVector<Book_S> books = {
+        std::vector<Book_S> books = {
             Book_S("1984", authors[0], 1949),
             Book_S("Harry Potter and the Philosopher's Stone", authors[1], 1997),
             Book_S("The Hobbit", authors[2], 1937),
@@ -101,7 +98,7 @@ void fillBooksBD(uDBase& db)
         {
             odb::core::transaction t(db->begin());
             for (auto& author : authors)
-                db->persist(author);
+                db->persist(author.get()); // Используем get() для получения сырого указателя
             t.commit();
         }
 
@@ -126,26 +123,47 @@ int main(int argc, char* argv[])
     QCoreApplication a(argc, argv);
 
     const std::string dbPath = "test_db.sqlite";
-    uDBase db(openDB(dbPath));
+    std::unique_ptr<odb::database> db(openDB(dbPath));
 
-    // TODO Как-то нужно выполнять лишь раз
+    // fillBooksBD(db);
-    fillBooksBD(db);
-
-    // Сохранение дополнителньых авторов в базу данных
-    {
-        auto authors = fillAuthorDB();
-        odb::core::transaction t(db->begin());
-        for (auto& author : authors)
-        {
-            SH<Author_S> tempAuthor = SH<Author_S>::create(author.first, author.last, author.age);
-            db->persist(tempAuthor);
-        }
-        t.commit();
-    }
 
     RestApiServer server(*db);
     server.start(8080);
 
+    /* Опыты с odb */
+
+    // const std::string dbPath = "test_db.sqlite";
+
+    // std::vector<Author_S> authors;
+
+    // odb::core::transaction trans(db->begin());
+    // for (auto data : fillDB())
+    // {
+    //     auto a = Author_S(data.first, data.last, data.age);
+    //     db->persist(a);
+    // }
+    // trans.commit();
+
+    // try
+    // {
+    //     odb::core::transaction tr(db->begin());
+    //     odb::query<Author_S> query;
+    //     odb::result<Author_S> result;
+
+    //     odb::result<Author_S> r(db->query<Author_S>(odb::query<Author_S>::age >= 2000));
+
+    //     for (const auto& author : r)
+    //     {
+    //         std::cout << "First: " << author.first() << ", Last: " << author.last() << ", Year: " << author.age() << std::endl;
+    //     }
+
+    //     tr.commit();
+    // }
+    // catch (const odb::exception& e)
+    // {
+    //     std::cerr << "ODB error: " << e.what() << std::endl;
+    //     return 1;
+    // }
     // Set up code that uses    the Qt event loop here.
     // Call a.quit() or a.exit() to quit the application.
     // A not very useful example would be including

src/model/book_s.h

@@ -1,64 +0,0 @@
-// file      : hello/person.hxx
-// copyright : not copyrighted - public domain
-
-#ifndef BOOK_S_H
-#define BOOK_S_H
-
-#include "model_global.h"
-
-#include <QSharedPointer>
-#include <QString>
-#include <odb/core.hxx>
-#include <rcore/smarttypes.h>
-
-#include "author_s.h"
-
-#pragma db object
-class MODEL_EXPORT Book_S
-{
-public:
-    Book_S() = default;
-
-    Book_S(const QString& name,
-           const SH<Author_S>& author,
-           const int year)
-    {
-        m_author = author;
-        m_name = name;
-        m_year = year;
-    };
-
-    unsigned long long id() const { return m_id; }
-    SH<Author_S> author() const { return m_author; }
-    QString name() const { return m_name; }
-    int year() const { return m_year; }
-
-private:
-    friend class odb::access;
-
-private:
-#pragma db id auto
-    quint64 m_id;
-
-    SH<Author_S> m_author;
-    QString m_name;
-    quint8 m_year;
-};
-
-// #pragma db view object(Book_S) object(Author_S = author:Book_S::m_author)
-// struct BookByAuthorView
-// {
-// #pragma db column(Book_S::m_id)
-//     quint64 book_id;
-
-// #pragma db column(Book_S::m_name)
-//     QString book_name;
-
-// #pragma db column(Book_S::m_year)
-//     qint8 year;
-
-// #pragma db column(Author_S::m_first + " " + Author_S::m_last)
-//     QString author_full_name;
-// };
-
-#endif // BOOK_S_H

src/model/model.qbs

@@ -1,43 +0,0 @@
-/*!
-    \qmltype cpp-opds
-    \inherits Project
-    \brief Описание
-*/
-PSLibrary {
-    cpp.defines: [
-        // You can make your code fail to compile if it uses deprecated APIs.
-        // In order to do so, uncomment the following line.
-        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
-        "DATABASE_SQLITE",
-        "MODEL_LIBRARY"
-    ]
-    consoleApplication: true
-
-    Depends { name: "Qt"; submodules: [ "core", "network" ] }
-    Depends { name: "cpp" }
-
-    Depends { name: "odb.gen" }
-    Depends { name: "rdbase" }
-
-    Depends { name: "redkit_gen" }
-    redkit_gen.includeModules: ["JsonSerializer"]
-
-    odb.gen.databases: "sqlite"
-    cpp.cxxLanguageVersion: "c++17"
-
-    Group {
-        id: odbs
-        name: "odb"
-        files: [
-            "**/*.h",
-        ]
-        fileTags: ["hpp", "odbxx", "rgen"]
-    }
-
-    cpp.dynamicLibraries: [
-        "odb-sqlite",
-        "odb-qt",
-        "odb",
-        "sqlite3"
-    ]
-}

src/model/model_global.h

@@ -1,12 +0,0 @@
-#ifndef MODEL_GLOBAL_H
-#define MODEL_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(MODEL_LIBRARY)
-#define MODEL_EXPORT Q_DECL_EXPORT
-#else
-#define MODEL_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // MODEL_GLOBAL_H

src/restapi/restapi.qbs

@@ -3,7 +3,7 @@
     \inherits Project
     \brief Описание
 */
-WPSLibrary {
+PSLibrary {
     cpp.defines: [
         // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
@@ -15,10 +15,10 @@ WPSLibrary {
     Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
     Depends { name: "cpp" }
     Depends { name: "database" }
-    Depends { name: "odb.gen" }
+    Depends { name: "odbModule"}
-    Depends { name: "redkit_gen" }
+
-    Depends { name: "rdbase" }
+
-    Depends { name: "model" }
+    // Depends { name: "redkit_gen" }
 
     cpp.cxxLanguageVersion: "c++20"
 
@@ -28,12 +28,4 @@ WPSLibrary {
             "restapiserver.*",
         ]
     }
-
-    cpp.dynamicLibraries: [
-        "odb-sqlite",
-        "odb-qt",
-        "odb",
-        "sqlite3"
-    ]
-
 } // Project

src/restapi/restapiserver.cpp

@@ -5,17 +5,14 @@
 #include <QJsonObject>
 #include <QJsonValue>
 
-#include <model/author_s-odb.hxx> // Должен быть здесь
+#include <database/book_s.h>
-#include <model/author_s.h>
+
-#include <model/book_s-odb.hxx> // Должен быть здесь
+#include "database/book_s-odb.hxx"
-#include <model/book_s.h>
 
 #include <odb/core.hxx>
 #include <odb/database.hxx>
 #include <odb/query.hxx>
 
-#include <redkit-gen-modules/json_serializer.h>
-
 RestApiServer::RestApiServer(odb::database& db, QObject* parent) :
     QTcpServer(parent), m_db(db) {}
 
@@ -27,8 +24,7 @@ void RestApiServer::start(quint16 port)
     }
     else
     {
-        qDebug() << "REST API сервер запущен по адресу:";
+        qDebug() << "REST API сервер запущен на порту:" << port;
-        qDebug() << QString("http://127.0.0.1:%1").arg(port);
     }
 }
 
@@ -39,8 +35,6 @@ void RestApiServer::incomingConnection(qintptr socketDescriptor)
 
     connect(socket, &QTcpSocket::readyRead, this, &RestApiServer::handleRequest);
     connect(socket, &QTcpSocket::disconnected, socket, &QTcpSocket::deleteLater);
-
-    qWarning() << "Есть входящее подключение" << socket->socketDescriptor();
 }
 
 void RestApiServer::handleRequest()
@@ -59,36 +53,28 @@ void RestApiServer::handleRequest()
 
 QByteArray RestApiServer::processRequest(const QString& request)
 {
-    // qWarning() << request << "\n\n";
-
     if (request.startsWith("GET /books/author/"))
     {
         QString author = request.section(' ', 1, 1).section('/', 3, 3).replace("%20", " ");
-        quint64 ageReq = author.toInt();
 
-        QStringList nameParts = author.split(' ');
+        // Books books;
-        QString firstName = nameParts.size() > 0 ? nameParts[0] : "";
+        // QList<BookRecord> results = books.getBooksByAuthor(author);
-        QString lastName = nameParts.size() > 1 ? nameParts[1] : "";
 
-        odb::transaction t(m_db.begin());
+        QByteArray jsonResponse = "{ \"books\": [";
+        // for (const BookRecord& book : results)
+        // {
+        //     jsonResponse += QString("{ \"id\": %1, \"title\": \"%2\", \"author\": \"%3\", \"year\": %4 },")
+        //                     .arg(book.id)
+        //                     .arg(book.title)
+        //                     .arg(book.author)
+        //                     .arg(book.year)
+        //                     .toUtf8();
+        // }
+        // if (results.size() > 0)
+        //     jsonResponse.chop(1); // Убираем последнюю запятую
+        // jsonResponse += "] }";
 
-        auto books = m_db.query<Book_S>(odb::query<Book_S>::author->id == ageReq);
+        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jsonResponse;
-
-        QJsonArray jArray;
-        for (const auto& book : books)
-        {
-            QJsonObject j;
-            j["id"] = QString::number(book.id());
-            j["name"] = book.name();
-            j["author"] = book.author()->full_name();
-            j["year"] = book.year();
-            jArray.push_back(j);
-        }
-        auto jDoc = QJsonDocument(jArray);
-
-        t.commit();
-
-        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
     }
 
     if (request.startsWith("GET /books"))
@@ -97,18 +83,20 @@ QByteArray RestApiServer::processRequest(const QString& request)
         odb::result<Book_S> res(m_db.query<Book_S>());
 
         QJsonArray jArray;
+
         for (auto it = res.begin(); it != res.end(); ++it)
         {
             const auto& book = *it;
 
             QJsonObject j;
             j["id"] = QString::number(book.id());
-            j["title"] = book.name();
+            j["title"] = QString::fromStdString(book.name());
-            j["author"] = book.author()->full_name();
+            j["author"] = QString::fromStdString(book.author()->full_name());
             j["year"] = book.year();
             jArray.push_back(j);
         }
         auto jDoc = QJsonDocument(jArray);
+
         t.commit();
 
         return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
@@ -120,20 +108,21 @@ QByteArray RestApiServer::processRequest(const QString& request)
         odb::result<Author_S> res(m_db.query<Author_S>());
 
         QJsonArray jArray;
+
         for (auto it = res.begin(); it != res.end(); ++it)
         {
             const auto& author = *it;
 
             QJsonObject j;
             j["id"] = QString::number(author.id());
-            j["first"] = author.firstName();
+            j["first"] = QString::fromStdString(author.first());
-            j["last"] = author.lastName();
+            j["last"] = QString::fromStdString(author.last());
             j["age"] = author.age();
             jArray.push_back(j);
         }
         auto jDoc = QJsonDocument(jArray);
-        t.commit();
 
+        t.commit();
         return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
     }