X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fdavical.rb;h=77b06b4777714a50a7ea18aa15e2116389128b2b;hp=04d5fbf024dde17e47375afa486d4359c897c9dd;hb=20b843bddcd73833d41f98ff79d92ef59bb4d81e;hpb=bd2dabf89ab277fbe315b05e6dfa839afb5ce5ef

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 04d5fbf..77b06b4 100644
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -12,34 +12,22 @@ 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 NonexistentAccountError.new(account) if not user_exists(account)
+    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
 
     sql_queries = ['DELETE FROM usr WHERE username = $1']
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    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()
-
-    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