Wrap all close() calls in "ensure" blocks and simplify DB connection-making.

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

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index bebab618b06f190e979fb79c632c7239a409cccf..46bd4073bfd459b4b2569ed1fd1d2f3a4657974f 100644 (file)
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -3,40 +3,36 @@ require 'pg'
 require 'common/agendav_plugin'
 require 'rm/rm_plugin'
 
 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
 
 
 class AgendavRm
 
   include AgendavPlugin
   include RmPlugin
 
 

-  def delete_user(user)
-    # 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;'
 
     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;'
 

+    connection = PG::Connection.new(@db_hash)

     begin
     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, [user.to_s()])
       end
       sql_queries.each do |sql_query|
         connection.query(sql_query, [user.to_s()])
       end

-
+    ensure
+      # Make sure the connection gets closed even if a query explodes.

       connection.close()
       connection.close()

-
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)

     end
     end

-

   end
 
 end
   end
 
 end