Stop pretending that we'll ever work with another DBMS.

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

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 86273cba6e5d2a31f0fb617b24a88f9088d523cc..77b06b4777714a50a7ea18aa15e2116389128b2b 100644 (file)
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -12,37 +12,23 @@ class DavicalRm
   include RmPlugin
 
 
   include RmPlugin
 
 

-  def delete_domain(domain)
-    # DAViCal doesn't have a concept of domains.
-  end
-
-
-  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.
     # 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.

-    sql_queries = ['DELETE FROM usr WHERE username = $1']
+    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)

 
 

-    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
+    sql_queries = ['DELETE FROM usr WHERE username = $1']

 
 

-      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
 
     end
 

+    connection.close()

   end
 
   end
 

+

 end
 end