Разнос по библиотекам + прикручиваем odb из redkitty

.gitmodules

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

prerequisites/qbs/imports/SQLiteArtifactsExport.qbs

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

prerequisites/qbs/modules/karchive/karchive.qbs

@@ -0,0 +1,53 @@
+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,17 +3,18 @@ import qbs
 Project {
     name: "opds++"
     qbsSearchPaths: [
-        "qbs",
+        "redkitty/qbs",
-        // "redkitty/qbs",
+        "redkbuild",
-        // // "guiness/qbs",
+        "redkitty/lib/redkit-gen-integration/qbs",
-        // // "prerequisites/qbs",
+        "prerequisites/qbs",
-        // // "report/qbs",
-        // "redkbuild",
-        // // "ext_libs/openssl/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/restapi/restapi.qbs",
     ]
 }

qbs/modules/odbModule/odbModule.qbs

@@ -1,48 +0,0 @@
-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 + "/../"),
-                input.filePath,
-            ]);
-            cmd.description = "Generating ODB files for " + input.fileName;
-
-            console.error(cmd.arguments)
-
-            return [cmd];
-        }
-    }
-    cpp.includePaths: [ project.sourceDirectory, product.Qt.core.qmDir ]
-}

src/book_s.h

@@ -1,46 +0,0 @@
-// file      : hello/person.hxx
-// copyright : not copyrighted - public domain
-
-#ifndef BOOK_S_H
-#define BOOK_S_H
-
-#include <memory>
-#include <string>
-
-#include <odb/core.hxx>
-
-#include "author_s.h"
-
-#pragma db object
-class 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/cpp-opds.qbs

@@ -3,7 +3,7 @@
     \inherits Project
     \brief Описание
 */
-Application {
+PSApplication {
     // CppApplication {
         cpp.defines: [
             // You can make your code fail to compile if it uses deprecated APIs.
@@ -15,44 +15,28 @@ Application {
 
         Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
         Depends { name: "cpp" }
-        Depends { name: "odbModule"}
+        Depends { name: "database" }
-
+        Depends { name: "odb.gen" }
-        // Depends { name: "redkit_gen" }
+        Depends { name: "sqlite3" }
+        Depends { name: "restapi" }
+        Depends { name: "redkit_gen" }
+        Depends { name: "rdbase" }
 
         cpp.cxxLanguageVersion: "c++20"
 
         Group {
             name: "cpp"
             files: [
-                "books.*",
-                "databasemanager.*",
                 "main.cpp",
-                "restapiserver.*",
             ]
         }
 
-        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",
-            "odb-sqlite"
+            "sqlite3"
         ]
+
     // }
 } // Project

src/database/author_s.h

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

src/database/book_s.h

@@ -0,0 +1,64 @@
+// file      : hello/person.hxx
+// copyright : not copyrighted - public domain
+
+#ifndef BOOK_S_H
+#define BOOK_S_H
+
+#include "database_global.h"
+
+#include <QSharedPointer>
+#include <QString>
+#include <odb/core.hxx>
+#include <rcore/smarttypes.h>
+
+#include "author_s.h"
+
+#pragma db object
+class DATABASE_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/database/database.hxx

@@ -34,16 +34,20 @@
 
 #include <filesystem>
 #include <random>
+#include <rcore/smarttypes.h>
+
+using oDBase = odb::sqlite::database;
+using uDBase = U<oDBase>;
 
 struct testData
 {
-    std::string first;
+    QString first;
-    std::string last;
+    QString last;
     int age;
 };
 
 // Функция для генерации случайной строки (имени или фамилии)
-std::string generate_random_string(const std::vector<std::string>& pool)
+QString generate_random_string(const QVector<QString>& pool)
 {
     static std::random_device rd;
     static std::mt19937 gen(rd());
@@ -60,16 +64,16 @@ int generate_random_year(int min_year = 1900, int max_year = 2020)
     return dis(gen);
 }
 
-std::vector<testData> fillDB()
+QVector<testData> fillDB()
 {
-    std::vector<std::string> first_names = {
+    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"
     };
-    std::vector<std::string> last_names = {
+    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",
@@ -77,12 +81,12 @@ std::vector<testData> fillDB()
         "Rogers", "Gutierrez", "Ramirez", "Diaz", "Perez", "Ross", "Sanders", "Price", "Howard", "Cooper"
     };
 
-    std::vector<testData> vecTest;
+    QVector<testData> vecTest;
 
     for (int i = 0; i < 50; ++i)
     {
-        std::string first_name = generate_random_string(first_names);
+        QString first_name = generate_random_string(first_names);
-        std::string last_name = generate_random_string(last_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 });
@@ -91,21 +95,23 @@ std::vector<testData> fillDB()
     return vecTest;
 }
 
-inline std::unique_ptr<odb::database> openDB(std::string path_db)
+inline uDBase openDB(const 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 std::unique_ptr<odb::core::database>(new odb::sqlite::database(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
+        return uDBase(db_ptr);
 
     // И создать новую, если не существует
-    std::unique_ptr<odb::core::database> db(new odb::sqlite::database(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
+    uDBase db(db_ptr);
 
-    odb::core::connection_ptr connect_ptr(db->connection());
+    odb::connection_ptr connect_ptr(db->connection());
 
     connect_ptr->execute("PRAGMA foreign_keys=OFF");
 
-    odb::core::transaction tans(db->begin());
+    odb::transaction tans(db->begin());
-    odb::core::schema_catalog::create_schema(*db);
+    odb::schema_catalog::create_schema(*db);
     tans.commit();
 
     connect_ptr->execute("PRAGMA foreign_keys=ON");

src/database/database.qbs

@@ -0,0 +1,55 @@
+/*!
+    \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",
+        "DATABASE_LIBRARY"
+    ]
+    consoleApplication: true
+
+    Depends { name: "Qt"; submodules: [ "core", "sql", "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 {
+        name: "cpp"
+        files: [
+            "databasemanager.*",
+            "*.cpp",
+            "*.h",
+            "*.hxx",
+        ]
+        excludeFiles: odbs.files
+    }
+
+    Group {
+        id: odbs
+        name: "odb"
+        files: [
+            "author_s.h",
+            "book_s.h",
+        ]
+        fileTags: ["hpp", "odbxx"]
+    }
+
+    cpp.dynamicLibraries: [
+        "odb-sqlite",
+        "odb-qt",
+        "odb",
+        "sqlite3"
+    ]
+}

src/database/database_global.h

@@ -0,0 +1,12 @@
+#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/databasemanager.cpp

@@ -1,118 +0,0 @@
-#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/databasemanager.h

@@ -1,59 +0,0 @@
-#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 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,48 +1,50 @@
 #include <QCoreApplication>
 
-#include "restapiserver.h"
+#include <QPointer>
+#include <QSharedPointer>
+#include <QString>
+#include <QVector>
+
+#include <restapi/restapiserver.h>
 
 /* Опыты с odb */
-#include "author_s-odb.hxx" // Должен быть здесь
+#include <database/author_s-odb.hxx> // Должен быть здесь
-#include "author_s.h"
+#include <database/author_s.h>
-
+#include <database/book_s-odb.hxx> // Должен быть здесь
-#include "book_s-odb.hxx" // Должен быть здесь
+#include <database/book_s.h>
-#include "book_s.h"
+#include <database/database.hxx> // create_database
-
 #include <odb/database.hxx>
 
-#include "database.hxx" // create_database
+#include <iostream>
 
-using unidb = std::unique_ptr<odb::database>;
+void fillBooksBD(uDBase& db)
-
-void fillBooksBD(unidb& db)
 {
     try
     {
-        std::vector<std::shared_ptr<Author_S>> authors = {
+        QVector<SH<Author_S>> authors = {
-            std::make_shared<Author_S>("George", "Orwell", 142),
+            SH<Author_S>::create("George", "Orwell", 142),
-            std::make_shared<Author_S>("J.K.", "Rowling", 56),
+            SH<Author_S>::create("J.K.", "Rowling", 56),
-            std::make_shared<Author_S>("J.R.R.", "Tolkien", 81),
+            SH<Author_S>::create("J.R.R.", "Tolkien", 81),
-            std::make_shared<Author_S>("Leo", "Tolstoy", 189),
+            SH<Author_S>::create("Leo", "Tolstoy", 189),
-            std::make_shared<Author_S>("Fyodor", "Dostoevsky", 174),
+            SH<Author_S>::create("Fyodor", "Dostoevsky", 174),
-            std::make_shared<Author_S>("Mark", "Twain", 183),
+            SH<Author_S>::create("Mark", "Twain", 183),
-            std::make_shared<Author_S>("Charles", "Dickens", 208),
+            SH<Author_S>::create("Charles", "Dickens", 208),
-            std::make_shared<Author_S>("Virginia", "Woolf", 134),
+            SH<Author_S>::create("Virginia", "Woolf", 134),
-            std::make_shared<Author_S>("Ernest", "Hemingway", 122),
+            SH<Author_S>::create("Ernest", "Hemingway", 122),
-            std::make_shared<Author_S>("Gabriel", "García Márquez", 98),
+            SH<Author_S>::create("Gabriel", "García Márquez", 98),
-            std::make_shared<Author_S>("Franz", "Kafka", 100),
+            SH<Author_S>::create("Franz", "Kafka", 100),
-            std::make_shared<Author_S>("Harper", "Lee", 64),
+            SH<Author_S>::create("Harper", "Lee", 64),
-            std::make_shared<Author_S>("William", "Shakespeare", 459),
+            SH<Author_S>::create("William", "Shakespeare", 459),
-            std::make_shared<Author_S>("Oscar", "Wilde", 155),
+            SH<Author_S>::create("Oscar", "Wilde", 155),
-            std::make_shared<Author_S>("Aldous", "Huxley", 123),
+            SH<Author_S>::create("Aldous", "Huxley", 123),
-            std::make_shared<Author_S>("Jane", "Austen", 210),
+            SH<Author_S>::create("Jane", "Austen", 210),
-            std::make_shared<Author_S>("John", "Steinbeck", 116),
+            SH<Author_S>::create("John", "Steinbeck", 116),
-            std::make_shared<Author_S>("Agatha", "Christie", 124),
+            SH<Author_S>::create("Agatha", "Christie", 124),
-            std::make_shared<Author_S>("Isaac", "Asimov", 105)
+            SH<Author_S>::create("Isaac", "Asimov", 105)
         };
 
         // Список книг
-        std::vector<Book_S> books = {
+        QVector<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),
@@ -99,7 +101,7 @@ void fillBooksBD(unidb& db)
         {
             odb::core::transaction t(db->begin());
             for (auto& author : authors)
-                db->persist(author.get()); // Используем get() для получения сырого указателя
+                db->persist(author); // Используем get() для получения сырого указателя
             t.commit();
         }
 
@@ -124,47 +126,14 @@ int main(int argc, char* argv[])
     QCoreApplication a(argc, argv);
 
     const std::string dbPath = "test_db.sqlite";
-    std::unique_ptr<odb::database> db(openDB(dbPath));
+    uDBase db(openDB(dbPath));
 
+    // TODO Как-то нужно выполнять лишь раз
     // fillBooksBD(db);
 
     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/author.h

@@ -0,0 +1,56 @@
+#ifndef AUTHOR_H
+#define AUTHOR_H
+
+#include <sql_builder/create_table.h>
+
+#include <QString>
+
+namespace model
+{
+
+namespace authorconst
+{
+
+const QString TABLE = "authors";
+
+const QString ID = "id";
+const QString NAME = "name";
+
+// const QString M_AUTHOR_ID = "id";
+// const QString M_AUTHOR_FIRST_NAME = "first_name";
+// const QString M_AUTHOR_LAST_NAME = "last_name";
+// const QString M_AUTHOR_YEAR = "year";
+
+}
+
+struct Author
+{
+    int id = 0;
+    QString name;
+    // QString firstName;
+    // QString lastName;
+    // QString birthdayYear;
+};
+
+static inline QString createTableAuthor()
+{
+    // query.exec("CREATE TABLE IF NOT EXISTS authors ("
+    //            "id INTEGER PRIMARY KEY AUTOINCREMENT,"
+    //            "name TEXT UNIQUE NOT NULL"
+    //            ")");
+
+    Builder::TableSchema tBuilder(model::authorconst::TABLE);
+    tBuilder.addColumn({ .name = model::authorconst::ID,
+                         .type = "INTEGER",
+                         .primaryKey = true });
+
+    tBuilder.addColumn({ .name = model::authorconst::NAME,
+                         .type = "TEXT",
+                         .notNull = true,
+                         .unique = true });
+    return tBuilder.get();
+}
+
+} // namespace model
+
+#endif // AUTHOR_H

src/model/book.h

@@ -0,0 +1,65 @@
+#ifndef BOOK_H
+#define BOOK_H
+
+#include <model/author.h>
+
+#include <sql_builder/create_table.h>
+
+#include <QString>
+
+namespace model
+{
+
+namespace bookconst
+{
+
+const QString TABLE = "books";
+
+const QString ID = "id";
+const QString TITLE = "title";
+const QString AUTHOR_ID = "author_id";
+const QString FILEPATH = "file_path";
+
+}
+
+struct Book
+{
+    int id = 0;
+    QString title;
+    Author author;
+    QString filePath;
+};
+
+static inline QString createTableBook()
+{
+    // query.exec("CREATE TABLE IF NOT EXISTS books ("
+    //            "id INTEGER PRIMARY KEY AUTOINCREMENT,"
+    //            "title TEXT NOT NULL,"
+    //            "file_path TEXT NOT NULL,"
+    //            "author_id INTEGER NOT NULL,"
+    //            "FOREIGN KEY (author_id) REFERENCES authors(id) ON DELETE CASCADE"
+    //            ");");
+
+    Builder::TableSchema tBuilder(model::bookconst::TABLE);
+    tBuilder.addColumn({ .name = model::bookconst::ID,
+                         .type = "INTEGER",
+                         .primaryKey = true });
+
+    tBuilder.addColumn({ .name = model::bookconst::TITLE,
+                         .type = "TEXT",
+                         .notNull = true });
+
+    tBuilder.addColumn({ .name = model::bookconst::FILEPATH,
+                         .type = "TEXT",
+                         .notNull = true });
+
+    tBuilder.addColumn({ .name = model::bookconst::AUTHOR_ID,
+                         .type = "INTEGER",
+                         .notNull = true,
+                         .foreignKeyTable = model::authorconst::TABLE,
+                         .foreignKeyColumn = model::authorconst::ID });
+    return tBuilder.get();
+}
+
+} // namespace model
+#endif // BOOK_H

src/model/model.qbs

@@ -0,0 +1,15 @@
+import qbs
+
+PSLibrary {
+    Depends { name: "Qt"; submodules: "core", "sql"}
+
+    Depends { name: "sql_builder" }
+
+    Group {
+        name: "cpp"
+        files: [
+            "*.h",
+            "*.cpp"
+        ]
+    }
+}

src/repositories/author_repository.cpp

@@ -0,0 +1,78 @@
+// #define BUILD_REPOSITORIES
+#include "author_repository.h"
+
+#include <sql_builder/insert.h>
+#include <sql_builder/select.h>
+
+#include <QDebug>
+
+QVector<model::Author> AuthorRepository::getAll()
+{
+    QVector<model::Author> authors;
+
+    Builder::Select sBuilder({ .tableName = model::authorconst::TABLE, .rows = { model::authorconst::ID, model::authorconst::NAME } });
+    QSqlQuery query(sBuilder.get());
+
+    qDebug() << query.lastError().text();
+
+    while (query.next())
+    {
+        authors.append({ query.value(0).toInt(),
+                         query.value(1).toString() });
+    }
+
+    return authors;
+}
+
+std::optional<model::Author> AuthorRepository::getByName(const QString& name)
+{
+    Q_UNUSED(name);
+    Builder::Select sBuilder({ .tableName = model::authorconst::TABLE, .rows = { model::authorconst::ID, model::authorconst::NAME } });
+    QString qResult = sBuilder.get() + QString(" WHERE %1 = \"%2\"").arg(model::authorconst::NAME).arg(name);
+
+    QSqlQuery query(qResult);
+
+    if (query.next())
+    {
+        model::Author author({ .id = query.value(0).toInt(),
+                               .name = query.value(1).toString() });
+        return { author };
+    }
+
+    return std::nullopt;
+}
+
+bool AuthorRepository::insert(const model::Author& author)
+{
+    QSqlQuery query(DatabaseManager::instance().database());
+    Builder::Insert iBuild({ model::authorconst::TABLE,
+                             { model::authorconst::NAME },
+                             true });
+
+    query.prepare(iBuild.get());
+    query.bindValue(":name", author.name);
+    int authorId = 0;
+    Q_UNUSED(authorId);
+
+    if (!query.exec())
+    {
+        qDebug() << query.lastError().text();
+        if (query.lastError().nativeErrorCode() == 19)
+        {
+            // Автор уже есть, ищем его ID
+            QSqlQuery findQuery(DatabaseManager::instance().database());
+            findQuery.prepare("SELECT id FROM authors WHERE name = :name");
+            findQuery.bindValue(":name", author.name);
+            if (findQuery.exec() && findQuery.next())
+            {
+                authorId = findQuery.value(0).toInt();
+                return true;
+            }
+        }
+        qCritical() << "Ошибка добавления автора:" << query.lastError().text();
+        return false;
+    }
+
+    authorId = query.lastInsertId().toInt();
+    return true;
+}

src/repositories/author_repository.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <model/author.h>
+
+#include <database/databasemanager.h>
+
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+#include <optional>
+
+#ifdef BUILD_REPOSITORIES
+#define REPOSITORIES_EXPORT Q_DECL_EXPORT
+#else
+#define REPOSITORIES_EXPORT Q_DECL_IMPORT
+#endif
+
+class REPOSITORIES_EXPORT AuthorRepository
+{
+public:
+    static QVector<model::Author> getAll();
+    static std::optional<model::Author> getByName(const QString& name);
+    static bool insert(const model::Author& author);
+
+    // TODO Возвращать не bool - а номер id записи
+};

src/repositories/book_repository.cpp

@@ -0,0 +1,59 @@
+// #define BUILD_REPOSITORIES
+#include "book_repository.h"
+
+#include <QDebug>
+#include <qsqlerror.h>
+
+#include <sql_builder/insert.h>
+#include <sql_builder/select.h>
+
+QVector<model::Book> BookRepository::getAll()
+{
+    QVector<model::Book> books;
+    Builder::Select qBuilder {
+        model::bookconst::TABLE,
+        { model::bookconst::ID,
+          model::bookconst::TITLE,
+          model::bookconst::AUTHOR_ID,
+          model::bookconst::FILEPATH }
+    };
+
+    QSqlQuery query(qBuilder.get());
+
+    qDebug() << query.lastError().text();
+
+    while (query.next())
+    {
+        books.append({ query.value(0).toInt(),
+                       query.value(1).toString(),
+                       { query.value(2).toInt() },
+                       query.value(3).toString() });
+    }
+
+    // TODO получить так же авторов как строку
+
+    return books;
+}
+
+bool BookRepository::insert(const model::Book& book)
+{
+    QSqlQuery query(DatabaseManager::instance().database());
+
+    Builder::Insert iBuilder {
+        model::bookconst::TABLE,
+        { model::bookconst::TITLE,
+          model::bookconst::FILEPATH,
+          model::bookconst::AUTHOR_ID }
+    };
+
+    query.prepare(iBuilder.get());
+    query.bindValue(":" + model::bookconst::TITLE, book.title);
+    query.bindValue(":" + model::bookconst::FILEPATH, book.filePath);
+    query.bindValue(":" + model::bookconst::AUTHOR_ID, book.author.id);
+
+    bool res = query.exec();
+    if (!res)
+        qDebug() << query.lastError().text();
+
+    return res;
+}

src/repositories/book_repository.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <model/book.h>
+
+#include <database/databasemanager.h>
+
+#include <QSqlQuery>
+#include <QVariant>
+#include <QVector>
+
+#ifdef BUILD_REPOSITORIES
+#define REPOSITORIES_EXPORT Q_DECL_EXPORT
+#else
+#define REPOSITORIES_EXPORT Q_DECL_IMPORT
+#endif
+
+class REPOSITORIES_EXPORT BookRepository
+{
+public:
+    static QVector<model::Book> getAll();
+    static bool insert(const model::Book& book);
+};

src/repositories/repositories.qbs

@@ -0,0 +1,21 @@
+import qbs
+
+PSLibrary {
+    Depends { name: "Qt"; submodules: "core", "sql"}
+
+    Depends { name: "database" }
+    Depends { name: "sql_builder" }
+
+    Group {
+        name: "cpp"
+        files: [
+            "*.h",
+            "*.cpp"
+        ]
+    }
+
+    Properties {
+        condition: qbs.buildVariant === "debug"
+        cpp.defines: ["BUILD_REPOSITORIES"]
+    }
+}

src/restapi/restapi.qbs

@@ -0,0 +1,38 @@
+/*!
+    \qmltype cpp-opds
+    \inherits Project
+    \brief Описание
+*/
+WPSLibrary {
+    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"
+    ]
+    consoleApplication: true
+
+    Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
+    Depends { name: "cpp" }
+    Depends { name: "database" }
+    Depends { name: "odb.gen" }
+    Depends { name: "redkit_gen" }
+    Depends { name: "rdbase" }
+
+    cpp.cxxLanguageVersion: "c++20"
+
+    Group {
+        name: "cpp"
+        files: [
+            "restapiserver.*",
+        ]
+    }
+
+    cpp.dynamicLibraries: [
+        "odb-sqlite",
+        "odb-qt",
+        "odb",
+        "sqlite3"
+    ]
+
+} // Project

src/restapi/restapiserver.cpp

@@ -5,15 +5,19 @@
 #include <QJsonObject>
 #include <QJsonValue>
 
-#include "book_s-odb.hxx"
+#include <database/author_s-odb.hxx> // Должен быть здесь
-#include "book_s.h"
+#include <database/author_s.h>
+#include <database/book_s-odb.hxx> // Должен быть здесь
+#include <database/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) :
-    m_db(db), QTcpServer(parent) {}
+    QTcpServer(parent), m_db(db) {}
 
 void RestApiServer::start(quint16 port)
 {
@@ -23,7 +27,8 @@ void RestApiServer::start(quint16 port)
     }
     else
     {
-        qDebug() << "REST API сервер запущен на порту:" << port;
+        qDebug() << "REST API сервер запущен по адресу:";
+        qDebug() << QString("http://127.0.0.1:%1").arg(port);
     }
 }
 
@@ -34,6 +39,8 @@ 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()
@@ -52,28 +59,36 @@ 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();
 
-        // Books books;
+        QStringList nameParts = author.split(' ');
-        // QList<BookRecord> results = books.getBooksByAuthor(author);
+        QString firstName = nameParts.size() > 0 ? nameParts[0] : "";
+        QString lastName = nameParts.size() > 1 ? nameParts[1] : "";
 
-        QByteArray jsonResponse = "{ \"books\": [";
+        odb::transaction t(m_db.begin());
-        // 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 += "] }";
 
-        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jsonResponse;
+        auto books = m_db.query<Book_S>(odb::query<Book_S>::author->id == ageReq);
+
+        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"))
@@ -82,20 +97,18 @@ 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"] = QString::fromStdString(book.name());
+            j["title"] = book.name();
-            j["author"] = QString::fromStdString(book.author()->full_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);
@@ -107,21 +120,20 @@ 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"] = QString::fromStdString(author.first());
+            j["first"] = author.firstName();
-            j["last"] = QString::fromStdString(author.last());
+            j["last"] = author.lastName();
             j["age"] = author.age();
             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);
     }
 

src/restapi/restapiserver.h

@@ -3,10 +3,11 @@
 
 #include <odb/database.hxx>
 
+#include <QObject>
 #include <QTcpServer>
 #include <QTcpSocket>
 
-class RestApiServer : public QTcpServer
+class Q_DECL_EXPORT RestApiServer : public QTcpServer
 {
     Q_OBJECT
 public:

src/services/author_service.cpp

@@ -0,0 +1,12 @@
+// #define BUILD_SERVICES
+#include "author_service.h"
+
+QVector<model::Author> AuthorService::fetchAll()
+{
+    return AuthorRepository::getAll();
+}
+
+bool AuthorService::add(const model::Author& author)
+{
+    return AuthorRepository::insert(author);
+}

src/services/author_service.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <model/author.h>
+
+#include <repositories/author_repository.h>
+
+#include <QVector>
+
+#ifdef BUILD_SERVICES
+#define SERVICES_EXPORT Q_DECL_EXPORT
+#else
+#define SERVICES_EXPORT Q_DECL_IMPORT
+#endif
+
+class SERVICES_EXPORT AuthorService
+{
+public:
+    static QVector<model::Author> fetchAll();
+    static bool add(const model::Author& name);
+};

src/services/book_service.cpp

@@ -0,0 +1,28 @@
+// #define BUILD_SERVICES
+#include "book_service.h"
+#include "author_service.h"
+
+QVector<model::Book> BookService::fetchAll()
+{
+    return BookRepository::getAll();
+}
+
+bool BookService::add(const model::Book& book)
+{
+    auto res = AuthorRepository::getByName(book.author.name);
+
+    if (!res.has_value())
+    {
+        if (!AuthorService::add(book.author))
+        {
+            qCritical() << "Ошибка добавления автора!";
+            return false;
+        }
+
+        res = AuthorRepository::getByName(book.author.name);
+    }
+
+    model::Book BookAuthor = book;
+    BookAuthor.author = res.value();
+    return BookRepository::insert(BookAuthor);
+}

src/services/book_service.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <model/book.h>
+
+#include <repositories/book_repository.h>
+
+#include <QVector>
+
+#ifdef BUILD_SERVICES
+#define SERVICES_EXPORT Q_DECL_EXPORT
+#else
+#define SERVICES_EXPORT Q_DECL_IMPORT
+#endif
+
+class SERVICES_EXPORT BookService
+{
+public:
+    static QVector<model::Book> fetchAll();
+    static bool add(const model::Book& book);
+};

src/services/services.qbs

@@ -0,0 +1,22 @@
+import qbs
+
+PSLibrary {
+    Depends { name: "Qt"; submodules: "core", "sql"}
+
+    Depends { name: "repositories" }
+
+    Group {
+        name: "cpp"
+        files: [
+            "*.h",
+            "*.cpp"
+        ]
+    }
+
+
+
+    Properties {
+        condition: qbs.buildVariant === "debug"
+        cpp.defines: ["BUILD_SERVICES"]
+    }
+}

src/sql_builder/create_table.cpp

@@ -0,0 +1,45 @@
+#include "create_table.h"
+
+#include <QDebug>
+
+namespace Builder
+{
+
+QString Column::toSQL() const
+{
+    QString columnDef = name + " " + type;
+    if (primaryKey)
+        columnDef += " PRIMARY KEY";
+    if (notNull)
+        columnDef += " NOT NULL";
+    if (unique)
+        columnDef += " UNIQUE";
+    if (defaultValue)
+        columnDef += " DEFAULT " + *defaultValue;
+    if (foreignKeyTable && foreignKeyColumn)
+    {
+        columnDef += " REFERENCES " + *foreignKeyTable + "(" + *foreignKeyColumn + ")";
+    }
+    return columnDef;
+}
+
+TableSchema& TableSchema::addColumn(const Column& column)
+{
+    columns.push_back(column);
+    return *this;
+}
+
+QString TableSchema::get() const
+{
+    QStringList columnDefs;
+    for (const auto& col : columns)
+    {
+        columnDefs.append(col.toSQL());
+    }
+
+    QString result = "CREATE TABLE IF NOT EXISTS " + name + " ( " + columnDefs.join(", ") + " );";
+    // qDebug() << result;
+    return result;
+}
+
+} // namespace Builder

src/sql_builder/create_table.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <QString>
+#include <QStringList>
+#include <QVector>
+
+#include <optional>
+
+namespace Builder
+{
+
+struct Column
+{
+    QString name;            // Имя колонки
+    QString type;            // Тип колонки
+    bool primaryKey = false; // Является ли колонка первичным ключом?
+    bool notNull = false;    // Колонка не должна быть пуста
+    bool unique = false;     // Значение в колонке должны быть уникальны
+    std::optional<QString> defaultValue;
+    std::optional<QString> foreignKeyTable;
+    std::optional<QString> foreignKeyColumn;
+
+    /*!
+     * \brief Сформировать SQL код для колонки
+     */
+    QString toSQL() const;
+};
+
+class Q_DECL_EXPORT TableSchema
+{
+public:
+    TableSchema(QString tableName) :
+        name(std::move(tableName)) {}
+
+    /*!
+     * \brief Добавить колонку
+     */
+    TableSchema& addColumn(const Column& column);
+
+    /*!
+     * \brief Сформировать SQL код для создания таблицы
+     */
+    QString get() const;
+
+private:
+    QString name;            // Имя таблицы
+    QVector<Column> columns; // Список колонок таблицы
+};
+
+} // namespace Builder

src/sql_builder/insert.cpp

@@ -0,0 +1,39 @@
+#include "insert.h"
+
+#include <QDebug>
+
+namespace Builder
+{
+
+namespace
+{
+
+const QString INSERT = QStringLiteral("INSERT");
+const QString INTO = QStringLiteral("INTO");
+const QString VALUES = QStringLiteral("VALUES");
+const QString IGNORE = QStringLiteral("IGNORE");
+
+}
+
+QString Insert::get() const
+{
+    QString resultString = QString("%1 ").arg(INSERT);
+    if (orIgnore)
+        resultString += QString("OR %1 ").arg(IGNORE);
+    resultString += QString("%1 %2 ").arg(INTO).arg(tableName);
+
+    resultString += QString("( %1 ) ").arg(rows.join(", "));
+
+    // TODO как будто бы проще сразу это заполнить значениями
+    QStringList allValue;
+    for (const auto& row : rows)
+        allValue.push_back(QString(":%1").arg(row));
+
+    resultString += QString("%1 ( %2 )").arg(VALUES).arg(allValue.join(", "));
+
+    resultString += ';';
+    // qDebug() << resultString;
+    return resultString;
+}
+
+} // namespace Builder

src/sql_builder/insert.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <QString>
+#include <QStringList>
+
+namespace Builder
+{
+
+struct Q_DECL_EXPORT Insert
+{
+    QString tableName; // Имя таблицы
+    QStringList rows;  // Именования колонок
+    // QStringList params;
+    bool orIgnore = false;
+
+    /*!
+     * \brief Сформировать SQL код для выполнения
+     */
+    QString get() const;
+};
+
+} // namespace Builder

src/sql_builder/select.cpp

@@ -0,0 +1,32 @@
+#include "select.h"
+
+#include <QDebug>
+
+namespace Builder
+{
+
+namespace
+{
+
+const QString SELECT = QStringLiteral("SELECT");
+const QString FROM = QStringLiteral("FROM");
+const QString WHERE = QStringLiteral("WHERE");
+
+}
+
+QString Select::get() const
+{
+    QString allRows = rows.join(", ");
+
+    QString resultString = QString("%1 %2").arg(SELECT).arg(allRows);
+
+    resultString += QString(" %1 %2").arg(FROM).arg(tableName);
+
+    if (!where.isEmpty())
+        resultString += QString(" %1 %2").arg(WHERE).arg(where);
+
+    // resultString += ';';
+    return resultString;
+}
+
+} // namespace Builder

src/sql_builder/select.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <QString>
+#include <QStringList>
+
+namespace Builder
+{
+
+struct Q_DECL_EXPORT Select
+{
+    QString tableName;          // Имя таблицы
+    QStringList rows = { "*" }; // Колонки
+    QString where = {};         // Условие поиска
+
+    /*!
+     * \brief Сформировать SQL код для выполнения
+     */
+    QString get() const;
+};
+
+} // namespace Builder

src/sql_builder/sql_builder.qbs

@@ -0,0 +1,14 @@
+import qbs
+
+PSLibrary {
+    Depends { name: "Qt"; submodules: "sql"}
+
+
+    Group {
+        name: "cpp"
+        files: [
+            "**/*.h",
+            "**/*.cpp"
+        ]
+    }
+}