Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复bug：在MSVC debug环境下，直接value解引用会触发cannot access empty value optional断… #185

Merged
merged 5 commits into from
Dec 15, 2024
+16 −1
Merged

修复bug：在MSVC debug环境下，直接value解引用会触发cannot access empty value optional断… #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18990a7
修复bug：在MSVC debug环境下，直接value解引用会触发cannot access empty value optional断…
TreatTrick Dec 11, 2024
ea69f67
赋初始值时先判断是否已经有值；初始化方式由小括号更改为花括号；
TreatTrick Dec 12, 2024
93bd286
添加对optional的query_s测试集
TreatTrick Dec 12, 2024
5d32428
用本地clang-format格式化文件
TreatTrick Dec 14, 2024
57849d3
format
qicosmos Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ormpp/mysql.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ class mysql {
std::map<size_t, std::vector<char>> &mp, B &is_null) {
using U = std::remove_const_t<std::remove_reference_t<T>>;
if constexpr (is_optional_v<U>::value) {
using value_type = typename U::value_type;
if (!value.has_value()) {
value = value_type{};
}
return set_param_bind(param_bind, *value, i, mp, is_null);
}
else if constexpr (std::is_enum_v<U>) {
Expand Down
13 changes: 12 additions & 1 deletion tests/test_ormpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,17 @@ TEST_CASE("optional") {
CHECK(vec2.front().age.value() == 200);
CHECK(vec2.front().name.value() == "purecpp");
CHECK(vec2.front().empty_.has_value() == false);

auto vec3 = mysql.query_s<test_optional>();
REQUIRE(vec3.size() > 0);
CHECK(vec3.front().age.value() == 200);
CHECK(vec3.front().name.value() == "purecpp");
CHECK(vec3.front().empty_.has_value() == false);
auto vec4 = mysql.query_s<test_optional>("select * from test_optional;");
REQUIRE(vec4.size() > 0);
CHECK(vec4.front().age.value() == 200);
CHECK(vec4.front().name.value() == "purecpp");
CHECK(vec4.front().empty_.has_value() == false);
}
#endif
#ifdef ORMPP_ENABLE_PG
Expand Down Expand Up @@ -2084,4 +2095,4 @@ TEST_CASE("unsigned type") {
CHECK(vec.front().h == 8);
}
#endif
}
}
Loading