Skip to content

Commit

Permalink
'#1923: Avoid joining with chat_view, which already joins many tables.
Browse files Browse the repository at this point in the history
  • Loading branch information
wladimirleite committed Jan 3, 2024
1 parent c5d3905 commit 0d2f2c5
Showing 1 changed file with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,8 @@ private static String getSelectMessagesQuery(Connection conn) throws SQLExceptio
grpInvTableJoin = " left join message_group_invite mgi on m._id=mgi.message_row_id";
}

return "select m._id AS id,cv._id as chatId, cv.raw_string_jid "
+ " as remoteId, jid.raw_string as remoteResource, status, mv.vcard, m.text_data,"
return "select m._id AS id,m.chat_row_id as chatId, chatJid.raw_string as remoteId,"
+ " jid.raw_string as remoteResource, status, mv.vcard, m.text_data,"
+ " m.from_me as fromMe, m.timestamp as timestamp, message_url as mediaUrl,"
+ " mm.mime_type as mediaMime, mm.file_length as mediaSize, media_name as mediaName,"
+ " m.message_type as messageType, latitude, longitude, mm.media_duration, " + captionCol
Expand All @@ -686,7 +686,9 @@ private static String getSelectMessagesQuery(Connection conn) throws SQLExceptio
+ " " + bizStateCol + " as bizStateId,"
+ " " + grpInvCol + " as groupInviteName,"
+ " " + sortCol + " as sortId"
+ " from message m inner join chat_view cv on m.chat_row_id=cv._id"
+ " from message m"
+ " left join chat on m.chat_row_id=chat._id"
+ " left join jid chatJid on chatJid._id=chat.jid_row_id"
+ " left join message_media mm on mm.message_row_id=m._id"
+ " left join jid on jid._id=m.sender_jid_row_id"
+ " left join message_location ml on m._id=ml.message_row_id "
Expand All @@ -702,14 +704,16 @@ private static String getSelectMessagesQuotesQuery(Connection conn) throws SQLEx
String captionCol = SQLite3DBParser.checkIfColumnExists(conn, "message_quoted_media", "media_caption")
? "mm.media_caption"
: "null";
return "select mq.message_row_id as id,cv._id as chatId, cv.raw_string_jid as remoteId,"
return "select mq.message_row_id as id,mq.chat_row_id as chatId, chatJid.raw_string as remoteId,"
+ " jid.raw_string as remoteResource, mv.vcard, mq.text_data,"
+ " mq.from_me as fromMe, mq.timestamp as timestamp, message_url as mediaUrl,"
+ " mm.mime_type as mediaMime, mm.file_length as mediaSize, media_name as mediaName,"
+ " mq.message_type as messageType, latitude, longitude, mm.media_duration, " + captionCol
+ " as mediaCaption, mm.file_hash as mediaHash, mm.thumbnail as thumbData,"
+ " mq.key_id as uuid"
+ " from message_quoted mq inner join chat_view cv on mq.chat_row_id=cv._id"
+ " from message_quoted mq"
+ " left join chat on mq.chat_row_id=chat._id"
+ " left join jid chatJid on chatJid._id=chat.jid_row_id"
+ " left join message_quoted_media mm on mm.message_row_id=mq.message_row_id"
+ " left join jid on jid._id=mq.sender_jid_row_id"
+ " left join message_quoted_location ml on mq.message_row_id=ml.message_row_id"
Expand Down

0 comments on commit 0d2f2c5

Please sign in to comment.