From 0c6c5bfa070c3afbd4a77d3a4e7237264d303d54 Mon Sep 17 00:00:00 2001 From: CodeGonshik Date: Wed, 14 Oct 2026 12:32:40 +0300 Subject: [PATCH 1/2] Rename repo: brazierORM to brazier-orm --- .github/workflows/build.yml | 12 ++++++------ .gitignore | 2 +- CMakeLists.txt | 11 ++--------- {brazierORM => brazier-orm}/CMakeLists.txt | 10 +++++----- .../brazierORM.cpp => brazier-orm/brazier-orm.cpp | 0 .../cmake/brazier-ormConfig.cmake.in | 0 .../include/BaseMigration.hpp | 0 {brazierORM => brazier-orm}/include/Collection.hpp | 0 {brazierORM => brazier-orm}/include/Database.hpp | 0 .../include/MigrationManager.hpp | 0 {brazierORM => brazier-orm}/include/Model.hpp | 0 .../include/ModelQueryBuilder.hpp | 0 .../include/SQLQueryBuilder.hpp | 0 .../include/SQLSchemaBuilder.hpp | 0 {brazierORM => brazier-orm}/include/SQLString.hpp | 0 {brazierORM => brazier-orm}/orm.hpp | 0 {brazierORM => brazier-orm}/src/Database.cpp | 0 {brazierORM => brazier-orm}/src/MigrationManager.cpp | 0 {brazierORM => brazier-orm}/src/SQLQueryBuilder.cpp | 0 {brazierORM => brazier-orm}/src/SQLSchemaBuilder.cpp | 0 {brazierORM => brazier-orm}/src/SQLString.cpp | 0 brazier-orm/tests/config/config.hpp | 5 +++++ .../tests/config/config_example.hpp | 0 .../tests/include/migrations.hpp | 0 {brazierORM => brazier-orm}/tests/include/models.hpp | 0 {brazierORM => brazier-orm}/tests/main.cpp | 0 {brazierORM => brazier-orm}/tests/main.h | 0 .../tests/unit/test_database.cpp | 0 .../tests/unit/test_migrations.cpp | 0 .../tests/unit/test_model.cpp | 0 vcpkg.json | 2 +- 31 files changed, 20 insertions(+), 22 deletions(-) rename {brazierORM => brazier-orm}/CMakeLists.txt (93%) rename brazierORM/brazierORM.cpp => brazier-orm/brazier-orm.cpp (100%) rename {brazierORM => brazier-orm}/cmake/brazier-ormConfig.cmake.in (100%) rename {brazierORM => brazier-orm}/include/BaseMigration.hpp (100%) rename {brazierORM => brazier-orm}/include/Collection.hpp (100%) rename {brazierORM => brazier-orm}/include/Database.hpp (100%) rename {brazierORM => brazier-orm}/include/MigrationManager.hpp (100%) rename {brazierORM => brazier-orm}/include/Model.hpp (100%) rename {brazierORM => brazier-orm}/include/ModelQueryBuilder.hpp (100%) rename {brazierORM => brazier-orm}/include/SQLQueryBuilder.hpp (100%) rename {brazierORM => brazier-orm}/include/SQLSchemaBuilder.hpp (100%) rename {brazierORM => brazier-orm}/include/SQLString.hpp (100%) rename {brazierORM => brazier-orm}/orm.hpp (100%) rename {brazierORM => brazier-orm}/src/Database.cpp (100%) rename {brazierORM => brazier-orm}/src/MigrationManager.cpp (100%) rename {brazierORM => brazier-orm}/src/SQLQueryBuilder.cpp (100%) rename {brazierORM => brazier-orm}/src/SQLSchemaBuilder.cpp (100%) rename {brazierORM => brazier-orm}/src/SQLString.cpp (100%) create mode 100644 brazier-orm/tests/config/config.hpp rename {brazierORM => brazier-orm}/tests/config/config_example.hpp (100%) rename {brazierORM => brazier-orm}/tests/include/migrations.hpp (100%) rename {brazierORM => brazier-orm}/tests/include/models.hpp (100%) rename {brazierORM => brazier-orm}/tests/main.cpp (100%) rename {brazierORM => brazier-orm}/tests/main.h (100%) rename {brazierORM => brazier-orm}/tests/unit/test_database.cpp (100%) rename {brazierORM => brazier-orm}/tests/unit/test_migrations.cpp (100%) rename {brazierORM => brazier-orm}/tests/unit/test_model.cpp (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c993765..d25087a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV - name: Create tests config - working-directory: brazierORM + working-directory: brazier-orm run: | mkdir -p tests/config cat > tests/config/config.hpp <<'EOF' @@ -113,7 +113,7 @@ jobs: -DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed -DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake - -S brazierORM + -S brazier-orm - name: Build run: cmake --build build --config ${{ matrix.build_type }} @@ -185,7 +185,7 @@ jobs: run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV - name: Create tests config - working-directory: brazierORM + working-directory: brazier-orm run: | New-Item -ItemType Directory -Force -Path "tests\config" | Out-Null @' @@ -213,7 +213,7 @@ jobs: -DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed -DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake - -S brazierORM + -S brazier-orm - name: Build run: cmake --build build --config ${{ matrix.build_type }} @@ -297,7 +297,7 @@ jobs: run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV - name: Create tests config - working-directory: brazierORM + working-directory: brazier-orm run: | mkdir -p tests/config cat > tests/config/config.hpp <<'EOF' @@ -325,7 +325,7 @@ jobs: -DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed -DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake - -S brazierORM + -S brazier-orm - name: Build run: cmake --build build --config ${{ matrix.build_type }} diff --git a/.gitignore b/.gitignore index 8664cc0..5230740 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ .env config.json -vcpkg-configuration.json +vcpkg-configuration.json \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 44860af..25a0f00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,5 @@ -# CMakeList.txt: файл проекта CMake верхнего уровня; проведите глобальную конфигурацию -# и включите сюда подпроекты. -# -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.10) -# Включение горячей перезагрузки для компиляторов MSVC, если поддерживается. if (POLICY CMP0141) cmake_policy(SET CMP0141 NEW) set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$,$>,$<$:EditAndContinue>,$<$:ProgramDatabase>>") @@ -27,7 +23,4 @@ endif() project ("brazier-orm") - - -# Включите подпроекты. -add_subdirectory ("brazierORM") +add_subdirectory ("brazier-orm") diff --git a/brazierORM/CMakeLists.txt b/brazier-orm/CMakeLists.txt similarity index 93% rename from brazierORM/CMakeLists.txt rename to brazier-orm/CMakeLists.txt index 41d8c4c..9d96916 100644 --- a/brazierORM/CMakeLists.txt +++ b/brazier-orm/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(brazier-orm VERSION 0.1.0 LANGUAGES CXX) +project(brazier-orm VERSION 0.1.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -56,15 +56,15 @@ if(MSVC) ) endif() -option(BUILD_DEMO "Build brazierORM demo executable" ON) +option(BUILD_DEMO "Build brazier-orm demo executable" ON) if(BUILD_DEMO) - add_executable(brazierORM brazierORM.cpp) - target_include_directories(brazierORM PRIVATE + add_executable(brazier-orm brazier-orm.cpp) + target_include_directories(brazier-orm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ) - target_link_libraries(brazierORM PRIVATE brazier_orm) + target_link_libraries(brazier-orm PRIVATE brazier_orm) endif() install(TARGETS brazier_orm diff --git a/brazierORM/brazierORM.cpp b/brazier-orm/brazier-orm.cpp similarity index 100% rename from brazierORM/brazierORM.cpp rename to brazier-orm/brazier-orm.cpp diff --git a/brazierORM/cmake/brazier-ormConfig.cmake.in b/brazier-orm/cmake/brazier-ormConfig.cmake.in similarity index 100% rename from brazierORM/cmake/brazier-ormConfig.cmake.in rename to brazier-orm/cmake/brazier-ormConfig.cmake.in diff --git a/brazierORM/include/BaseMigration.hpp b/brazier-orm/include/BaseMigration.hpp similarity index 100% rename from brazierORM/include/BaseMigration.hpp rename to brazier-orm/include/BaseMigration.hpp diff --git a/brazierORM/include/Collection.hpp b/brazier-orm/include/Collection.hpp similarity index 100% rename from brazierORM/include/Collection.hpp rename to brazier-orm/include/Collection.hpp diff --git a/brazierORM/include/Database.hpp b/brazier-orm/include/Database.hpp similarity index 100% rename from brazierORM/include/Database.hpp rename to brazier-orm/include/Database.hpp diff --git a/brazierORM/include/MigrationManager.hpp b/brazier-orm/include/MigrationManager.hpp similarity index 100% rename from brazierORM/include/MigrationManager.hpp rename to brazier-orm/include/MigrationManager.hpp diff --git a/brazierORM/include/Model.hpp b/brazier-orm/include/Model.hpp similarity index 100% rename from brazierORM/include/Model.hpp rename to brazier-orm/include/Model.hpp diff --git a/brazierORM/include/ModelQueryBuilder.hpp b/brazier-orm/include/ModelQueryBuilder.hpp similarity index 100% rename from brazierORM/include/ModelQueryBuilder.hpp rename to brazier-orm/include/ModelQueryBuilder.hpp diff --git a/brazierORM/include/SQLQueryBuilder.hpp b/brazier-orm/include/SQLQueryBuilder.hpp similarity index 100% rename from brazierORM/include/SQLQueryBuilder.hpp rename to brazier-orm/include/SQLQueryBuilder.hpp diff --git a/brazierORM/include/SQLSchemaBuilder.hpp b/brazier-orm/include/SQLSchemaBuilder.hpp similarity index 100% rename from brazierORM/include/SQLSchemaBuilder.hpp rename to brazier-orm/include/SQLSchemaBuilder.hpp diff --git a/brazierORM/include/SQLString.hpp b/brazier-orm/include/SQLString.hpp similarity index 100% rename from brazierORM/include/SQLString.hpp rename to brazier-orm/include/SQLString.hpp diff --git a/brazierORM/orm.hpp b/brazier-orm/orm.hpp similarity index 100% rename from brazierORM/orm.hpp rename to brazier-orm/orm.hpp diff --git a/brazierORM/src/Database.cpp b/brazier-orm/src/Database.cpp similarity index 100% rename from brazierORM/src/Database.cpp rename to brazier-orm/src/Database.cpp diff --git a/brazierORM/src/MigrationManager.cpp b/brazier-orm/src/MigrationManager.cpp similarity index 100% rename from brazierORM/src/MigrationManager.cpp rename to brazier-orm/src/MigrationManager.cpp diff --git a/brazierORM/src/SQLQueryBuilder.cpp b/brazier-orm/src/SQLQueryBuilder.cpp similarity index 100% rename from brazierORM/src/SQLQueryBuilder.cpp rename to brazier-orm/src/SQLQueryBuilder.cpp diff --git a/brazierORM/src/SQLSchemaBuilder.cpp b/brazier-orm/src/SQLSchemaBuilder.cpp similarity index 100% rename from brazierORM/src/SQLSchemaBuilder.cpp rename to brazier-orm/src/SQLSchemaBuilder.cpp diff --git a/brazierORM/src/SQLString.cpp b/brazier-orm/src/SQLString.cpp similarity index 100% rename from brazierORM/src/SQLString.cpp rename to brazier-orm/src/SQLString.cpp diff --git a/brazier-orm/tests/config/config.hpp b/brazier-orm/tests/config/config.hpp new file mode 100644 index 0000000..2fce95c --- /dev/null +++ b/brazier-orm/tests/config/config.hpp @@ -0,0 +1,5 @@ +const std::string db_name = "test"; +const std::string db_host = "localhost"; +const std::string db_port = "5432"; +const std::string db_user = "postgres"; +const std::string db_password = "qwerty"; \ No newline at end of file diff --git a/brazierORM/tests/config/config_example.hpp b/brazier-orm/tests/config/config_example.hpp similarity index 100% rename from brazierORM/tests/config/config_example.hpp rename to brazier-orm/tests/config/config_example.hpp diff --git a/brazierORM/tests/include/migrations.hpp b/brazier-orm/tests/include/migrations.hpp similarity index 100% rename from brazierORM/tests/include/migrations.hpp rename to brazier-orm/tests/include/migrations.hpp diff --git a/brazierORM/tests/include/models.hpp b/brazier-orm/tests/include/models.hpp similarity index 100% rename from brazierORM/tests/include/models.hpp rename to brazier-orm/tests/include/models.hpp diff --git a/brazierORM/tests/main.cpp b/brazier-orm/tests/main.cpp similarity index 100% rename from brazierORM/tests/main.cpp rename to brazier-orm/tests/main.cpp diff --git a/brazierORM/tests/main.h b/brazier-orm/tests/main.h similarity index 100% rename from brazierORM/tests/main.h rename to brazier-orm/tests/main.h diff --git a/brazierORM/tests/unit/test_database.cpp b/brazier-orm/tests/unit/test_database.cpp similarity index 100% rename from brazierORM/tests/unit/test_database.cpp rename to brazier-orm/tests/unit/test_database.cpp diff --git a/brazierORM/tests/unit/test_migrations.cpp b/brazier-orm/tests/unit/test_migrations.cpp similarity index 100% rename from brazierORM/tests/unit/test_migrations.cpp rename to brazier-orm/tests/unit/test_migrations.cpp diff --git a/brazierORM/tests/unit/test_model.cpp b/brazier-orm/tests/unit/test_model.cpp similarity index 100% rename from brazierORM/tests/unit/test_model.cpp rename to brazier-orm/tests/unit/test_model.cpp diff --git a/vcpkg.json b/vcpkg.json index c032dbc..e294fce 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brazier-orm-dev", - "version": "0.1.0", + "version": "0.1.1", "license": "LGPL-3.0-or-later", "description": "ORM from Brazier Framework", "builtin-baseline": "f2e1c41da38c71be74ef48684666991929b45418", From 388df77173a4d20d468af6a773767913f8fb647f Mon Sep 17 00:00:00 2001 From: CodeGonshik Date: Wed, 14 Oct 2026 12:44:13 +0300 Subject: [PATCH 2/2] fix: .gitignore --- brazier-orm/tests/config/config.hpp | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 brazier-orm/tests/config/config.hpp diff --git a/brazier-orm/tests/config/config.hpp b/brazier-orm/tests/config/config.hpp deleted file mode 100644 index 2fce95c..0000000 --- a/brazier-orm/tests/config/config.hpp +++ /dev/null @@ -1,5 +0,0 @@ -const std::string db_name = "test"; -const std::string db_host = "localhost"; -const std::string db_port = "5432"; -const std::string db_user = "postgres"; -const std::string db_password = "qwerty"; \ No newline at end of file