From 9392a185e1f1ffd192ffc0b36bfa401143738ba8 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 19 Mar 2013 11:38:12 -0400 Subject: [PATCH] Remove unnecessary queries from the Roundcube plugin. --- lib/mailshears/plugins/roundcube_db.rb | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/lib/mailshears/plugins/roundcube_db.rb b/lib/mailshears/plugins/roundcube_db.rb index d563a24..7d1a037 100644 --- a/lib/mailshears/plugins/roundcube_db.rb +++ b/lib/mailshears/plugins/roundcube_db.rb @@ -40,28 +40,16 @@ class RoundcubeDb # belonging to it. user_id = self.get_user_id(account) - # This is mostly unnecessary when using Postgres. The Roundcube - # developers were nice enough to include DBMS-specific install and - # upgrade scripts, so Postgres can take advantage of ON DELETE - # triggers. Here's an example: + # The Roundcube developers were nice enough to include + # DBMS-specific install and upgrade scripts, so Postgres can take + # advantage of ON DELETE triggers. Here's an example: # # ... # user_id integer NOT NULL # REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE # - sql_queries = ['DELETE FROM cache WHERE user_id = $1::int;'] - sql_queries << 'DELETE FROM cache_index WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM cache_messages WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM cache_thread WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM contactgroupmembers WHERE contactgroup_id IN (SELECT contactgroup_id FROM contactgroups WHERE user_id = $1::int);' - sql_queries << 'DELETE FROM contactgroups WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM contacts WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM identities WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM dictionary WHERE user_id = $1::int;' - sql_queries << 'DELETE FROM searches WHERE user_id = $1::int;' - - # This one is of course necessary with any DBMS. - sql_queries << 'DELETE FROM users WHERE user_id = $1::int;' + # This query is of course necessary with any DBMS: + sql_queries = ['DELETE FROM users WHERE user_id = $1::int;'] begin connection = PGconn.connect(@db_host, -- 2.43.2