Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix an error when binding a function pointer to SqlBinder (#1097)

This commit is contained in:
An Tao 2021-12-01 08:39:42 +08:00 committed by GitHub
parent f522d2d70e
commit d6b09c9e1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
orm_lib/inc/drogon/orm/SqlBinder.h
View File

@ -176,8 +176,8 @@ class CallbackHolder : public CallbackHolderBase
run(result);
}
CallbackHolder(Function &&function)
: function_(std::forward<Function>(function))
template <typename T>
CallbackHolder(T &&function) : function_(std::forward<T>(function))
{
static_assert(traits::isSqlCallback,
"Your sql callback function type is wrong!");
@ -323,7 +323,8 @@ class DROGON_EXPORT SqlBinder : public trantor::NonCopyable
SqlBinder &operator=(SqlBinder &&that) = delete;
~SqlBinder();
template <typename CallbackType,
typename traits = FunctionTraits<CallbackType>>
typename traits =
FunctionTraits<typename std::decay<CallbackType>::type>>
typename std::enable_if<traits::isExceptCallback && traits::isPtr,
self>::type &
operator>>(CallbackType &&callback)
@ -335,7 +336,8 @@ class DROGON_EXPORT SqlBinder : public trantor::NonCopyable
}
template <typename CallbackType,
typename traits = FunctionTraits<CallbackType>>
typename traits =
FunctionTraits<typename std::decay<CallbackType>::type>>
typename std::enable_if<traits::isExceptCallback && !traits::isPtr,
self>::type &
operator>>(CallbackType &&callback)
@ -346,12 +348,13 @@ class DROGON_EXPORT SqlBinder : public trantor::NonCopyable
}
template <typename CallbackType,
typename traits = FunctionTraits<CallbackType>>
typename traits =
FunctionTraits<typename std::decay<CallbackType>::type>>
typename std::enable_if<traits::isSqlCallback, self>::type &operator>>(
CallbackType &&callback)
{
callbackHolder_ = std::shared_ptr<CallbackHolderBase>(
new CallbackHolder<CallbackType>(
new CallbackHolder<typename std::decay<CallbackType>::type>(
std::forward<CallbackType>(callback)));
return *this;
}

28
orm_lib/tests/db_test.cc
View File

@ -32,6 +32,9 @@
using namespace std::chrono_literals;
using namespace drogon::orm;
void expFunction(const DrogonDbException &e)
{
}
#if USE_POSTGRESQL
DbClientPtr postgreClient;
DROGON_TEST(PostgreTest)
@ -40,6 +43,12 @@ DROGON_TEST(PostgreTest)
// Prepare the test environment
*clientPtr << "DROP TABLE IF EXISTS USERS" >> [TEST_CTX](const Result &r) {
SUCCESS();
clientPtr->execSqlAsync(
"select 1 as result",
[TEST_CTX](const drogon::orm::Result &r) {
MANDATE(r.size() == 1);
},
expFunction);
} >> [TEST_CTX](const DrogonDbException &e) {
FAULT("postgresql - Prepare the test environment(0) what():" +
std::string(e.base().what()));
@ -674,6 +683,7 @@ DROGON_TEST(PostgreTest)
}
};
drogon::sync_wait(coro_test());
#endif
}
#endif
@ -686,7 +696,15 @@ DROGON_TEST(MySQLTest)
REQUIRE(clientPtr != nullptr);
// Prepare the test environment
*clientPtr << "CREATE DATABASE IF NOT EXISTS drogonTestMysql" >>
[TEST_CTX](const Result &r) { SUCCESS(); } >>
[TEST_CTX](const Result &r) {
SUCCESS();
clientPtr->execSqlAsync(
"select 1 as result",
[TEST_CTX](const drogon::orm::Result &r) {
MANDATE(r.size() == 1);
},
expFunction);
} >>
[TEST_CTX](const DrogonDbException &e) {
FAULT("mysql - Prepare the test environment(0) what():" +
std::string(e.base().what()));
@ -1260,6 +1278,7 @@ DROGON_TEST(MySQLTest)
}
};
drogon::sync_wait(coro_test());
#endif
}
#endif
@ -1274,6 +1293,12 @@ DROGON_TEST(SQLite3Test)
// Prepare the test environment
*clientPtr << "DROP TABLE IF EXISTS users" >> [TEST_CTX](const Result &r) {
SUCCESS();
clientPtr->execSqlAsync(
"select 1 as result",
[TEST_CTX](const drogon::orm::Result &r) {
MANDATE(r.size() == 1);
},
expFunction);
} >> [TEST_CTX](const DrogonDbException &e) {
FAULT("sqlite3 - Prepare the test environment(0): what():" +
std::string(e.base().what()));
@ -1906,6 +1931,7 @@ DROGON_TEST(SQLite3Test)
trantor::EventLoop::getEventLoopOfCurrentThread(), 1.0s);
};
drogon::sync_wait(coro_test());
#endif
}
#endif