Page MenuHomePhorge
Files F32209005

D14846.1765123211.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D14846.1765123211.diff
View Options

diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -528,16 +528,18 @@
std::vector<MessageStoreThread>
SQLiteQueryExecutor::getAllMessageStoreThreads() const {
static std::string getAllMessageStoreThreadsSQL =
- "SELECT * "
- "FROM message_store_threads;";
+ "SELECT * FROM message_store_threads "
+ "UNION "
+ "SELECT * FROM backup_message_store_threads;";
return getAllEntities<MessageStoreThread>(
this->getConnection(), getAllMessageStoreThreadsSQL);
}
std::vector<Thread> SQLiteQueryExecutor::getAllThreads() const {
static std::string getAllThreadsSQL =
- "SELECT * "
- "FROM threads;";
+ "SELECT * FROM threads "
+ "UNION "
+ "SELECT * FROM backup_threads;";
return getAllEntities<Thread>(this->getConnection(), getAllThreadsSQL);
};
@@ -945,8 +947,9 @@
std::vector<ThreadActivityEntry>
SQLiteQueryExecutor::getAllThreadActivityEntries() const {
static std::string getAllThreadActivityEntriesSQL =
- "SELECT * "
- "FROM thread_activity;";
+ "SELECT * FROM thread_activity "
+ "UNION "
+ "SELECT * FROM backup_thread_activity;";
return getAllEntities<ThreadActivityEntry>(
this->getConnection(), getAllThreadActivityEntriesSQL);
}
@@ -985,8 +988,9 @@
std::vector<EntryInfo> SQLiteQueryExecutor::getAllEntries() const {
static std::string getAllEntriesSQL =
- "SELECT * "
- "FROM entries;";
+ "SELECT * FROM entries "
+ "UNION "
+ "SELECT * FROM backup_entries;";
return getAllEntities<EntryInfo>(this->getConnection(), getAllEntriesSQL);
}
@@ -1033,8 +1037,9 @@
std::vector<LocalMessageInfo>
SQLiteQueryExecutor::getAllMessageStoreLocalMessageInfos() const {
static std::string getAllLocalMessageInfosSQL =
- "SELECT * "
- "FROM message_store_local;";
+ "SELECT * FROM message_store_local "
+ "UNION "
+ "SELECT * FROM backup_message_store_local;";
return getAllEntities<LocalMessageInfo>(
this->getConnection(), getAllLocalMessageInfosSQL);
}
diff --git a/web/shared-worker/_generated/comm_query_executor.wasm b/web/shared-worker/_generated/comm_query_executor.wasm
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 4:00 PM (17 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5842901
Default Alt Text
D14846.1765123211.diff (2 KB)

Event Timeline