diff --git a/.github/workflows/typical-presets.yml b/.github/workflows/typical-presets.yml index 5f54821..4bc6138 100644 --- a/.github/workflows/typical-presets.yml +++ b/.github/workflows/typical-presets.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: vcpkg_target_triplet: ['x64-windows', 'x64-linux'] - build_type: ['release'] + build_type: ['debug'] include: - vcpkg_target_triplet: 'x64-linux' mono: 'mono' diff --git a/CMakeLists.txt b/CMakeLists.txt index 03b702c..4043256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,10 @@ set_target_properties(TinyOrmQueryTest PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RU enable_testing() -add_test(NAME QSqlQueryTest COMMAND QSqlQueryTest -o "${CMAKE_CURRENT_BINARY_DIR}/QSqlQueryTest.xml,junitxml" COMMAND_EXPAND_LISTS) +add_test(NAME QSqlQueryTest COMMAND QSqlQueryTest -o -,txt -o "${CMAKE_CURRENT_BINARY_DIR}/QSqlQueryTest.xml,junitxml" COMMAND_EXPAND_LISTS) set_property(TEST QSqlQueryTest PROPERTY ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin") set_property(TEST QSqlQueryTest APPEND PROPERTY ENVIRONMENT_MODIFICATION "QT_PLUGIN_PATH=set:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/Qt6/plugins") -add_test(NAME TinyOrmQueryTest COMMAND TinyOrmQueryTest -o "${CMAKE_CURRENT_BINARY_DIR}/TinyOrmQueryTest.xml,junitxml" COMMAND_EXPAND_LISTS) +add_test(NAME TinyOrmQueryTest COMMAND TinyOrmQueryTest -o -,txt -o "${CMAKE_CURRENT_BINARY_DIR}/TinyOrmQueryTest.xml,junitxml" COMMAND_EXPAND_LISTS) set_property(TEST TinyOrmQueryTest PROPERTY ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin") set_property(TEST TinyOrmQueryTest APPEND PROPERTY ENVIRONMENT_MODIFICATION "QT_PLUGIN_PATH=set:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/Qt6/plugins") diff --git a/TinyOrmQueryTest.cpp b/TinyOrmQueryTest.cpp index ec7fae9..49487e5 100644 --- a/TinyOrmQueryTest.cpp +++ b/TinyOrmQueryTest.cpp @@ -1,3 +1,7 @@ +#include +#include +#include + #include "TinyOrmQueryTest.hpp" namespace MyNamespace @@ -120,6 +124,64 @@ namespace MyNamespace QVERIFY(exceptionReceived); QCOMPARE(rowCount, 2); } + + void MyTinyTest::columnAlias() + { + try { + + Orm::DB::beginTransaction(); + Orm::Schema::create( + "users", + [](Orm::SchemaNs::Blueprint &table) + { + table.id(); + table.text("email").nullable(); + table.text("name").nullable(); + } + ); + + Orm::DB::table("users")->insertGetId( + QVariantMap{ + {"name", "John Doe"}, + {"email", "johndoe@domain.org"} + } + ); + + Orm::DB::table("users")->insertGetId( + QVariantMap{ + {"name", "Jane Doe"}, + {"email", "janedoe@domain.org"} + } + ); + + QSqlQuery query = Orm::DB::table("users") + ->select({"name", "email AS user_email"}) + .get(); + + for(int n=0; query.next(); ++n) { + QSqlRecord record(query.record()); + for(int i=0; i m_db; diff --git a/vcpkg b/vcpkg index 475519c..af313df 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 475519c76d01f8620470d2c34c87df802bc57dc8 +Subproject commit af313df7a850a27a7431eb89e2f80d22564e3073