v0.2.8

src/queries/mysql/queries.rs

@@ -187,24 +187,25 @@ pub mod db_folders {
          ON DUPLICATE KEY UPDATE
              delimiter=VALUES(delimiter), parent=VALUES(parent), flags=VALUES(flags),
              is_subscribed=VALUES(is_subscribed), total_count=VALUES(total_count), unread_count=VALUES(unread_count),
-             uid_validity=VALUES(uid_validity), highest_modseq=VALUES(highest_modseq), updated_at=CURRENT_TIMESTAMP";
+             uid_validity=VALUES(uid_validity), highest_modseq=VALUES(highest_modseq),
+             counter_generation=counter_generation + 1, updated_at=CURRENT_TIMESTAMP";
     pub const Q_002: &str = "INSERT IGNORE INTO folders
             (name, delimiter, flags, is_subscribed, updated_at)
          VALUES (?, ?, ?, 1, CURRENT_TIMESTAMP)";
     pub const Q_003: &str = "SELECT name, delimiter, parent, flags, is_subscribed,
-                    total_count, unread_count, uid_validity, highest_modseq
+                    total_count, unread_count, uid_validity, highest_modseq, counter_generation
              FROM folders
              ORDER BY name";
     pub const Q_004: &str = "DELETE FROM folders";
     pub const Q_005: &str = "UPDATE folders SET updated_at = CURRENT_TIMESTAMP";
-    pub const Q_006: &str = "UPDATE folders SET uid_validity = ?, total_count = ?, messages_updated_at = CURRENT_TIMESTAMP
+    pub const Q_006: &str = "UPDATE folders SET uid_validity = ?, total_count = ?, counter_generation = counter_generation + 1, messages_updated_at = CURRENT_TIMESTAMP
          WHERE name = ?";
     pub const Q_007: &str =
-        "UPDATE folders SET uid_validity = ?, total_count = ?, highest_modseq = ?
+        "UPDATE folders SET uid_validity = ?, total_count = ?, highest_modseq = ?, counter_generation = counter_generation + 1
          WHERE name = ?";
     pub const Q_008: &str = "SELECT CAST(COUNT(*) AS SIGNED) FROM messages WHERE folder = ? AND LOCATE(CONCAT(CHAR(92), 'Seen'), flags) = 0";
-    pub const Q_009: &str = "UPDATE folders SET unread_count = ? WHERE name = ?";
-    pub const Q_010: &str = "UPDATE folders SET unread_count = GREATEST(0, CAST(unread_count AS SIGNED) + ?) WHERE name = ?";
+    pub const Q_009: &str = "UPDATE folders SET unread_count = ?, counter_generation = counter_generation + 1 WHERE name = ?";
+    pub const Q_010: &str = "UPDATE folders SET unread_count = GREATEST(0, CAST(unread_count AS SIGNED) + ?), counter_generation = counter_generation + 1 WHERE name = ?";
     pub const Q_011: &str = "SELECT EXISTS(
                 SELECT 1 FROM folders
                 WHERE updated_at > DATE_FORMAT(DATE_SUB(CURRENT_TIMESTAMP, INTERVAL ? SECOND), '%Y-%m-%d %H:%i:%s')
@@ -216,14 +217,14 @@ pub mod db_folders {
     pub const Q_013: &str = "SELECT messages_updated_at IS NULL FROM folders WHERE name = ?";
     pub const Q_014: &str = "UPDATE folders SET messages_updated_at = NULL WHERE name = ?";
     pub const Q_015: &str = "SELECT name, delimiter, parent, flags, is_subscribed,
-                total_count, unread_count, uid_validity, highest_modseq
+                total_count, unread_count, uid_validity, highest_modseq, counter_generation
          FROM folders
          WHERE name = ?";
     pub const Q_016: &str = "DELETE FROM messages WHERE folder = ?";
     pub const Q_017: &str = "DELETE FROM folders WHERE name = ?";
     pub const Q_018: &str = "SELECT 1";
-    pub const Q_019: &str = "INSERT INTO folders (name, delimiter, parent, flags, is_subscribed, total_count, unread_count, uid_validity, highest_modseq, updated_at, messages_updated_at)
-         SELECT ?, delimiter, parent, flags, is_subscribed, total_count, unread_count, uid_validity, highest_modseq, CURRENT_TIMESTAMP, messages_updated_at
+    pub const Q_019: &str = "INSERT INTO folders (name, delimiter, parent, flags, is_subscribed, total_count, unread_count, uid_validity, highest_modseq, counter_generation, updated_at, messages_updated_at)
+         SELECT ?, delimiter, parent, flags, is_subscribed, total_count, unread_count, uid_validity, highest_modseq, counter_generation, CURRENT_TIMESTAMP, messages_updated_at
          FROM folders WHERE name = ?";
     pub const Q_020: &str = "UPDATE messages SET folder = ? WHERE folder = ?";
     pub const Q_021: &str = "UPDATE message_tags SET message_folder = ? WHERE message_folder = ?";
@@ -235,9 +236,13 @@ pub mod db_folders {
     pub const Q_026: &str =
         "UPDATE folders SET messages_updated_at = '2000-01-01 00:00:00' WHERE name = 'Sent'";
     pub const Q_027: &str = "SELECT messages_updated_at FROM folders WHERE name = 'Sent'";
-    pub const Q_028: &str = "UPDATE folders SET unread_count = ? WHERE name = ?";
+    pub const Q_028: &str = "UPDATE folders SET unread_count = ?, counter_generation = counter_generation + 1 WHERE name = ?";
     pub const Q_029: &str =
         "UPDATE folders SET messages_updated_at = CURRENT_TIMESTAMP WHERE name = ?";
+    pub const Q_030: &str = "UPDATE folders SET total_count = ?, unread_count = ?, counter_generation = counter_generation + 1 WHERE name = ?";
+    pub const Q_031: &str =
+        "UPDATE folders SET uid_validity = ?, highest_modseq = ? WHERE name = ?";
+    pub const Q_032: &str = "UPDATE folders SET total_count = ?, unread_count = ?, counter_generation = counter_generation + 1 WHERE name = ? AND counter_generation = ?";
     pub const FORMAT_001: &str = "DELETE FROM folders WHERE name NOT IN ({})";
 }
 
@@ -310,6 +315,12 @@ pub mod db_messages {
              LIMIT ?";
     pub const Q_013: &str = "SELECT uid, flags FROM messages WHERE folder = ?";
     pub const Q_014: &str = "SELECT CAST(SUM(size) AS SIGNED) FROM messages";
+    pub const Q_015: &str = "SELECT COUNT(*) FROM messages
+             WHERE body_cached = 0
+               AND lower(folder) NOT IN ('trash', 'junk', 'spam')
+               AND lower(folder) NOT LIKE '%/trash'
+               AND lower(folder) NOT LIKE '%/junk'
+               AND lower(folder) NOT LIKE '%/spam'";
     pub const FORMAT_001: &str = "SELECT {MSG_SELECT_COLS}
          FROM messages
          WHERE folder = ?
@@ -463,9 +474,9 @@ pub mod routes_diagnostics {
 
 pub mod routes_folder_mgmt {
     pub const Q_001: &str = "UPDATE messages SET flags = CASE WHEN flags = '' THEN ?2 ELSE CONCAT(flags, ',', ?2) END WHERE folder = ?1 AND LOCATE(?2, flags) = 0";
-    pub const Q_002: &str = "UPDATE folders SET unread_count = 0 WHERE name = ?";
+    pub const Q_002: &str = "UPDATE folders SET unread_count = 0, counter_generation = counter_generation + 1 WHERE name = ?";
     pub const Q_003: &str = "SELECT uid FROM messages WHERE folder = ?";
-    pub const Q_004: &str = "UPDATE folders SET total_count = 0, unread_count = 0, messages_updated_at = CURRENT_TIMESTAMP WHERE name = ?";
+    pub const Q_004: &str = "UPDATE folders SET total_count = 0, unread_count = 0, counter_generation = counter_generation + 1, messages_updated_at = CURRENT_TIMESTAMP WHERE name = ?";
 }
 
 pub mod routes_messages_mod {