X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fdavical.rb;h=3526dcff2fa4f9fc57950c32ac50e34c44d6872c;hp=02e889466849fb7c67aad15e0812afce1e23e33e;hb=f819b178c5c1cb8adda0182c610e5c52fad8bea7;hpb=483d14dc8228a81d12fb109d3ed6510e2d2b03c1

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 02e8894..3526dcf 100644
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -12,10 +12,12 @@ class DavicalRm
   include RmPlugin
 
 
-  def delete_account(account)
+  def delete_user(user)
     # Delete the given username. DAViCal uses foreign keys properly
     # and only supports postgres, so we let the ON DELETE CASCADE
     # trigger handle most of the work.
+    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
+
     sql_queries = ['DELETE FROM usr WHERE username = $1']
 
     begin
@@ -28,7 +30,7 @@ class DavicalRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user.to_s()])
       end
 
       connection.close()