X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fdavical.rb;fp=lib%2Frm%2Fplugins%2Fdavical.rb;h=1029994b9edc77a6db010eeb73fd8ad776a1b3ed;hp=852d9c4c66b1fa97467de79c2628a34fd6320338;hb=b947ef8844f090eedd50be0383abe417d910bb1a;hpb=58849f9ba58bd0804ffe6c6d8248caf2ab66dc66

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 852d9c4..1029994 100644
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -23,16 +23,15 @@ class DavicalRm
   def remove_user(user)
     raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
 
-    sql_queries = ['DELETE FROM usr WHERE username = $1']
+    sql_query = 'DELETE FROM usr WHERE username = $1;'
 
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
-
-    sql_queries.each do |sql_query|
+    connection = PG::Connection.new(@db_hash)
+    begin
       connection.query(sql_query, [user.to_s()])
+    ensure
+      # Make sure the connection gets closed even if the query explodes.
+      connection.close()
     end
-
-    connection.close()
   end