lib,test: replace connection query() method with sync_exec{,_params}.

[mailshears.git] / lib / rm / plugins / agendav.rb

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 4bf6bc4aca11a2427c10e40151310bbeca452ea6..2c7709011ca3a421ced83d7d58e2f1aa3c6c2faf 100644 (file)
--- 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
@@ -35,13 +41,13 @@ class AgendavRm
     # of the user's email address in the "calendar" field happens when
     # he is also the owner, so the calendar does get deleted in the
     # normal situation.
-    sql_queries << "DELETE FROM shares WHERE REPLACE(owner, '%40', '@') ~ $1;"
-    sql_queries << "DELETE FROM shares WHERE REPLACE(with, '%40', '@')  ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(owner,'%40','@')    ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(\"with\",'%40','@') ~ $1;"
 
     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.