mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the Date to find a next page in RSM, not the id

Browse Source 
This way, it works, whatever the order of insertion in the database was.

fix #3343
This commit is contained in:
louiz’
2018-04-14 19:48:45 +02:00
parent d375a9edeb
commit 5ef7ba0802
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/database.cpp
+5 -4
View File
@@ -192,7 +192,7 @@ std::string Database::store_muc_message(const std::string& owner, const std::str
}
std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit, const std::string& start, const std::string& end, const Id::real_type reference_record_id, Database::Paging paging)
int limit, const std::string& start, const std::string& end, const std::string& reference_uuid, Database::Paging paging)
{
if (limit == 0)
return {};
@@ -222,14 +222,15 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
request << " and " << Database::Date{} << "<=" << writer;
}
}
if (reference_record_id != Id::unset_value)
if (!reference_uuid.empty())
{
request << " and " << Id{};
request << " and " << Database::Date{};
if (paging == Database::Paging::first)
request << ">";
else
request << "<";
request << reference_record_id;
request << "(SELECT " << Database::Date{} << " FROM " << Database::muc_log_lines.get_name().data()
<< " WHERE " << Database::Uuid{} << " = " << reference_uuid << ")";
}
if (paging == Database::Paging::first)
src/database/database.hpp
+1 -1
View File
@@ -135,7 +135,7 @@ class Database
*/
static std::vector<MucLogLine> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit=-1, const std::string& start="", const std::string& end="",
const Id::real_type reference_record_id=Id::unset_value, Paging=Paging::first);
const std::string& reference_record_id={}, Paging=Paging::first);
/**
* Get just one single record matching the given uuid, between (optional) end and start.