X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fagendav.rb;h=28f1eb4167a4a63bec61889ea47b97492d87f80f;hp=1366bd6db69a15452a0b777dd3b131e65b90d54a;hb=df4e02ebf6a4e28a58abcb298a4442a245ad0b15;hpb=483d14dc8228a81d12fb109d3ed6510e2d2b03c1

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 1366bd6..28f1eb4 100644
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -3,39 +3,35 @@ require 'pg'
 require 'common/agendav_plugin'
 require 'rm/rm_plugin'
 
+
+# Handle the removal of Agendav users from its database. Agendav has
+# no concept of domains.
+#
 class AgendavRm
 
   include AgendavPlugin
   include RmPlugin
 
 
-  def delete_account(account)
-    # Delete the given username and any records in other tables
-    # belonging to it.
+  # Remove *user* from the Agendav database. This should remove him
+  # from _every_ table in which he is referenced.
+  #
+  # @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;']
     sql_queries << 'DELETE FROM shared WHERE user_from = $1;'
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      sql_queries.each do |sql_query|
-        connection.query(sql_query, [account])
-      end
-
-      connection.close()
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+    sql_queries.each do |sql_query|
+      connection.query(sql_query, [user.to_s()])
     end
 
+    connection.close()
   end
 
 end