Changeset 2075 in subversion

Timestamp:

Nov 21, 2008 9:33:58 AM (5 years ago)

Author:

alec

Message:

• Fix 'cache' table cleanup on session destroy (#1485516)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• SQL/mysql.update.sql (modified) (1 diff)
• SQL/mysql5.initial.sql (modified) (1 diff)
• SQL/postgres.initial.sql (modified) (2 diffs)
• SQL/postgres.update.sql (modified) (1 diff)
• program/include/rcube_imap.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/11/21 (alec)
+----------
+- Fix 'cache' table cleanup on session destroy (#1485516)
 
 2008/11/19 (alec)

trunk/roundcubemail/SQL/mysql.update.sql

@@ -31 +31 @@
 ALTER TABLE `messages`
     ADD INDEX `created_index` (`created`);
+
+-- Updates from version 0.2-beta (InnoDB only)
+
+ALTER TABLE `cache`
+    ADD CONSTRAINT `session_id_fk_cache` FOREIGN KEY (`session_id`)
+    REFERENCES `session`(`sess_id`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE;

trunk/roundcubemail/SQL/mysql5.initial.sql

@@ -78 +78 @@
    REFERENCES `users`(`user_id`)
      ON DELETE CASCADE
+     ON UPDATE CASCADE,
+ CONSTRAINT `session_id_fk_cache` FOREIGN KEY (`session_id`)
+   REFERENCES `session`(`sess_id`)
+     ON DELETE CASCADE
      ON UPDATE CASCADE
 ) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;

trunk/roundcubemail/SQL/postgres.initial.sql

@@ -129 +129 @@
     cache_id integer DEFAULT nextval('cache_ids'::text) PRIMARY KEY,
     user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    session_id character varying(40) REFERENCES "session" (sess_id),
+    session_id character varying(40) REFERENCES "session" (sess_id) ON DELETE CASCADE ON UPDATE CASCADE,
     cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
     created timestamp with time zone DEFAULT now() NOT NULL,
@@ -136 +136 @@
 
 CREATE INDEX cache_user_id_idx ON "cache" (user_id, cache_key);
+CREATE INDEX cache_session_id_idx ON "cache" (session_id);
 
 --

trunk/roundcubemail/SQL/postgres.update.sql

@@ -22 +22 @@
 
 CREATE INDEX messages_created_idx ON messages (created);
+
+-- Updates from version 0.2-beta
+
+ALTER TABLE cache DROP CONSTRAINT cache_session_id_fkey;
+ALTER TABLE cache ADD FOREIGN KEY (session_id) REFERENCES session(sess_id) ON DELETE CASCADE ON UPDATE CASCADE;
+CREATE INDEX cache_session_id_idx ON "cache" (session_id);

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2147 +2147 @@
       $this->db->query(
         "UPDATE ".get_table_name('cache')."
-         SET    created=".$this->db->now().",
-                data=?
+         SET    created=".$this->db->now().", data=?, session_id=?
          WHERE  user_id=?
          AND    cache_key=?",
         $data,
+        session_id(),
         $_SESSION['user_id'],
         $key);
@@ -2160 +2160 @@
       $this->db->query(
         "INSERT INTO ".get_table_name('cache')."
-         (created, user_id, cache_key, data)
-         VALUES (".$this->db->now().", ?, ?, ?)",
+         (created, user_id, cache_key, data, session_id)
+         VALUES (".$this->db->now().", ?, ?, ?, ?)",
         $_SESSION['user_id'],
         $key,
-        $data);
+        $data,
+        session_id());
       }
     }