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

Modify some function signatures

This commit is contained in:
antao 2018-11-10 21:31:44 +08:00
parent 68cefc76e9
commit 979c6670c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orm_lib/inc/drogon/orm/Mapper.h
View File

@ -55,11 +55,11 @@ class Mapper
const ExceptionCallback &ecb) noexcept; const ExceptionCallback &ecb) noexcept;
std::future<std::vector<T>> findFutureAll() noexcept; std::future<std::vector<T>> findFutureAll() noexcept;
size_t count(const Criteria &criteria) noexcept(false); size_t count(const Criteria &criteria = Criteria()) noexcept(false);
void count(const Criteria &criteria, void count(const Criteria &criteria,
const CountCallback &rcb, const CountCallback &rcb,
const ExceptionCallback &ecb) noexcept; const ExceptionCallback &ecb) noexcept;
std::future<size_t> countFuture(const Criteria &criteria) noexcept; std::future<size_t> countFuture(const Criteria &criteria = Criteria()) noexcept;
T findOne(const Criteria &criteria) noexcept(false); T findOne(const Criteria &criteria) noexcept(false);
void findOne(const Criteria &criteria, void findOne(const Criteria &criteria,
@ -145,7 +145,7 @@ template <typename T>
inline T Mapper<T>::findByPrimaryKey(const typename T::PrimaryKeyType &key) noexcept(false) inline T Mapper<T>::findByPrimaryKey(const typename T::PrimaryKeyType &key) noexcept(false)
{ {
static_assert(!std::is_same<typename T::PrimaryKeyType, void>::value, "No primary key in the table!"); static_assert(!std::is_same<typename T::PrimaryKeyType, void>::value, "No primary key in the table!");
// return findOne(Criteria(T::primaryKeyName, key)); // return findOne(Criteria(T::primaryKeyName, key));
std::string sql = "select * from "; std::string sql = "select * from ";
sql += T::tableName; sql += T::tableName;
makePrimaryKeyCriteria(sql); makePrimaryKeyCriteria(sql);
@ -154,7 +154,7 @@ inline T Mapper<T>::findByPrimaryKey(const typename T::PrimaryKeyType &key) noex
Result r(nullptr); Result r(nullptr);
{ {
auto binder = _client << sql; auto binder = _client << sql;
outputPrimeryKeyToBinder(key,binder); outputPrimeryKeyToBinder(key, binder);
binder << Mode::Blocking; binder << Mode::Blocking;
binder >> [&r](const Result &result) { binder >> [&r](const Result &result) {
r = result; r = result;