moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

Rewrite/optimize some SQL statements

Browse Source
This commit is contained in:
cketti 2013-01-12 04:21:53 +01:00
parent 0a5a330820
commit 65a5a73737
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -1080,7 +1080,7 @@ public class LocalStore extends Store implements Serializable {
String[] selectionArgs = queryArgs.toArray(EMPTY_STRING_ARRAY); String[] selectionArgs = queryArgs.toArray(EMPTY_STRING_ARRAY);
String sqlQuery = "SELECT " + GET_MESSAGES_COLS + "FROM messages " + String sqlQuery = "SELECT " + GET_MESSAGES_COLS + "FROM messages " +
"JOIN threads ON (threads.message_id = messages.id) " + "LEFT JOIN threads ON (threads.message_id = messages.id) " +
"LEFT JOIN folders ON (folders.id = messages.folder_id) WHERE " + "LEFT JOIN folders ON (folders.id = messages.folder_id) WHERE " +
"((empty IS NULL OR empty != 1) AND deleted = 0)" + "((empty IS NULL OR empty != 1) AND deleted = 0)" +
((!StringUtils.isNullOrEmpty(where)) ? " AND (" + where + ")" : "") + ((!StringUtils.isNullOrEmpty(where)) ? " AND (" + where + ")" : "") +
@ -2051,7 +2051,7 @@ public class LocalStore extends Store implements Serializable {
"SELECT " + "SELECT " +
GET_MESSAGES_COLS + GET_MESSAGES_COLS +
"FROM messages " + "FROM messages " +
"JOIN threads ON (threads.message_id = messages.id) " + "LEFT JOIN threads ON (threads.message_id = messages.id) " +
"WHERE uid = ? AND folder_id = ?", "WHERE uid = ? AND folder_id = ?",
new String[] { new String[] {
message.getUid(), Long.toString(mFolderId) message.getUid(), Long.toString(mFolderId)
@ -2092,7 +2092,7 @@ public class LocalStore extends Store implements Serializable {
LocalFolder.this, LocalFolder.this,
"SELECT " + GET_MESSAGES_COLS + "SELECT " + GET_MESSAGES_COLS +
"FROM messages " + "FROM messages " +
"JOIN threads ON (threads.message_id = messages.id) " + "LEFT JOIN threads ON (threads.message_id = messages.id) " +
"WHERE (empty IS NULL OR empty != 1) AND " + "WHERE (empty IS NULL OR empty != 1) AND " +
(includeDeleted ? "" : "deleted = 0 AND ") + (includeDeleted ? "" : "deleted = 0 AND ") +
"folder_id = ? ORDER BY date DESC", "folder_id = ? ORDER BY date DESC",
@ -2364,8 +2364,8 @@ public class LocalStore extends Store implements Serializable {
private ThreadInfo getThreadInfo(SQLiteDatabase db, String messageId) { private ThreadInfo getThreadInfo(SQLiteDatabase db, String messageId) {
String sql = "SELECT t.id, t.message_id, t.root, t.parent " + String sql = "SELECT t.id, t.message_id, t.root, t.parent " +
"FROM threads t " + "FROM messages m " +
"JOIN messages m ON (t.message_id = m.id) " + "LEFT JOIN threads t ON (t.message_id = m.id) " +
"WHERE m.folder_id = ? AND m.message_id = ?"; "WHERE m.folder_id = ? AND m.message_id = ?";
String[] selectionArgs = { Long.toString(mFolderId), messageId }; String[] selectionArgs = { Long.toString(mFolderId), messageId };
Cursor cursor = db.rawQuery(sql, selectionArgs); Cursor cursor = db.rawQuery(sql, selectionArgs);
@ -2947,7 +2947,7 @@ public class LocalStore extends Store implements Serializable {
this, this,
"SELECT " + GET_MESSAGES_COLS + "SELECT " + GET_MESSAGES_COLS +
"FROM messages " + "FROM messages " +
"JOIN threads ON (threads.message_id = messages.id) " + "LEFT JOIN threads ON (threads.message_id = messages.id) " +
"WHERE (empty IS NULL OR empty != 1) AND " + "WHERE (empty IS NULL OR empty != 1) AND " +
"(folder_id = ? and date < ?)", "(folder_id = ? and date < ?)",
new String[] { new String[] {
@ -3852,7 +3852,7 @@ public class LocalStore extends Store implements Serializable {
"SELECT m.id " + "SELECT m.id " +
"FROM threads t1 " + "FROM threads t1 " +
"JOIN threads t2 ON (t1.parent = t2.id) " + "JOIN threads t2 ON (t1.parent = t2.id) " +
"JOIN messages m ON (t2.message_id = m.id) " + "LEFT JOIN messages m ON (t2.message_id = m.id) " +
"WHERE t1.message_id = ? AND m.empty = 1", "WHERE t1.message_id = ? AND m.empty = 1",
new String[] { Long.toString(messageId) }); new String[] { Long.toString(messageId) });