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 f7d116e0e783a08364701c97334668d04ca14d45..77b06b4777714a50a7ea18aa15e2116389128b2b 100644 (file)
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -16,30 +16,18 @@ class DavicalRm
     # 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.

-    raise NonexistentUserError.new(user) if not user_exists(user)
+    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)

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

+    connection.close()

   end
 
 
   end