X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fagendav.rb;h=2c7709011ca3a421ced83d7d58e2f1aa3c6c2faf;hp=e84c4f678fa98d1ecac7ae9b632fd8dea99f3927;hb=fa7782720ff15fce29b6f875678e9fd0c197485a;hpb=deef740ad4201e9a7db6d9b7411b596ec89c2e89

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index e84c4f6..2c77090 100644
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -16,11 +16,17 @@ class AgendavRm
   # Remove *user* from the Agendav database. This should remove him
   # from _every_ table in which he is referenced.
   #
+  # We do not raise an error if the user doesn't exist. This is due to
+  # an unfortunate problem with the "user exists" check in AgenDAV.
+  # The AgenDAV "shares" table is not tied directly to a username, so
+  # we are forced to use a regexp match to decide what rows to delete
+  # from that table. We do so regardless of whether or not the username
+  # exists in the "prefs" table, because that table stores only non-
+  # default preferences -- not all users' preferences.
+  #
   # @param user [User] the user to remove.
   #
   def remove_user(user)
-    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
-
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
 
     # The "shares" table contains principal URLs, and the "@" symbol
@@ -41,7 +47,7 @@ class AgendavRm
     connection = PG::Connection.new(@db_hash)
     begin
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [user.to_s()])
+        connection.sync_exec_params(sql_query, [user.to_s()])
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.