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

.gitmodules

@@ -1,6 +1,6 @@
 [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

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,61 @@
+#ifndef DATABASEMANAGER_H
+#define DATABASEMANAGER_H
+
+#include "database_global.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 DATABASE_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

@@ -134,6 +134,40 @@ int main(int argc, char* argv[])
     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

@@ -1,56 +0,0 @@
-#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

@@ -1,65 +0,0 @@
-#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

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

src/repositories/author_repository.cpp

@@ -1,78 +0,0 @@
-// #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

@@ -1,29 +0,0 @@
-#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

@@ -1,59 +0,0 @@
-// #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

@@ -1,22 +0,0 @@
-#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

@@ -1,21 +0,0 @@
-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/restapiserver.cpp

@@ -27,8 +27,8 @@ void RestApiServer::start(quint16 port)
     }
     else
     {
-        qDebug() << "REST API сервер запущен по адресу:";
+        QString addrs = "http://127.0.0.1:" + QString::number(this->serverPort());
-        qDebug() << QString("http://127.0.0.1:%1").arg(port);
+        qDebug() << "REST API сервер запущен по адресу:" << addrs;
     }
 }
 
@@ -59,7 +59,7 @@ void RestApiServer::handleRequest()
 
 QByteArray RestApiServer::processRequest(const QString& request)
 {
-    // qWarning() << request << "\n\n";
+    qWarning() << request << "\n\n";
 
     if (request.startsWith("GET /books/author/"))
     {
@@ -70,6 +70,11 @@ QByteArray RestApiServer::processRequest(const QString& request)
         QString firstName = nameParts.size() > 0 ? nameParts[0] : "";
         QString lastName = nameParts.size() > 1 ? nameParts[1] : "";
 
+        qWarning()
+        << "author:" << author << "\n"
+        << "firstName:" << firstName << "\n"
+        << "lastName:" << lastName << "\n";
+
         odb::transaction t(m_db.begin());
 
         auto books = m_db.query<Book_S>(odb::query<Book_S>::author->id == ageReq);
@@ -97,6 +102,7 @@ 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;
@@ -109,6 +115,7 @@ QByteArray RestApiServer::processRequest(const QString& request)
             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,6 +127,7 @@ 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;
@@ -132,8 +140,8 @@ QByteArray RestApiServer::processRequest(const QString& request)
             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);
     }
 

src/services/author_service.cpp

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

@@ -1,20 +0,0 @@
-#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

@@ -1,28 +0,0 @@
-// #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

@@ -1,20 +0,0 @@
-#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

@@ -1,22 +0,0 @@
-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

@@ -1,45 +0,0 @@
-#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

@@ -1,50 +0,0 @@
-#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

@@ -1,39 +0,0 @@
-#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

@@ -1,22 +0,0 @@
-#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

@@ -1,32 +0,0 @@
-#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

@@ -1,21 +0,0 @@
-#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

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