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

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

diff --git a/lib/mv/plugins/davical.rb b/lib/mv/plugins/davical.rb
index ee47d3039fd9feb71235000ff0f93e4f6dfe69ff..e7aa050889384234bc8802b924e58038290084c6 100644 (file)
--- a/lib/mv/plugins/davical.rb
+++ b/lib/mv/plugins/davical.rb
@@ -3,46 +3,41 @@ require 'pg'
 require 'common/davical_plugin'
 require 'rm/rm_plugin'
 
 require 'common/davical_plugin'
 require 'rm/rm_plugin'
 

+# Handle moving (renaming) DAViCal users in its database. DAViCal has
+# no concept of domains.
+#

 class DavicalMv
 class DavicalMv

-  #
-  # DAViCal only supports Postgres, so even if we ever are
-  # database-agnostic, this plugin can't be.
-  #

   include DavicalPlugin
   include MvPlugin
 
 
   include DavicalPlugin
   include MvPlugin
 
 

-  def mv_domain(from, to)
-    # DAViCal doesn't have a concept of domains.
-  end
-
+  # Move the user *src* to *dst* within the DAViCal database. This
+  # should "rename" him in _every_ table where he is referenced.
+  # DAViCal uses foreign keys properly, so we let the ON UPDATE
+  # CASCADE trigger handle most of the work.
+  #
+  # This can fail is *src* does not exist, or if *dst* already exists
+  # before the move. It should also be an error if the destination
+  # domain doesn't exist. But DAViCal doesn't know about domains, so
+  # we let that slide.
+  #
+  # @param src [User] the source user to be moved.
+  #
+  # @param dst [User] the destination user being moved to.
+  #
+  def mv_user(src, dst)
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)

 
 

-  def mv_account(from, to)
-    # Delete the given username. DAViCal uses foreign keys properly
-    # and only supports postgres, so we let the ON UPDATE CASCADE
-    # trigger handle most of the work.
-    sql_queries = ['UPDATE usr SET username = $1 WHERE username = $2']
+    sql_query = 'UPDATE usr SET username = $1 WHERE username = $2;'

 
 

+    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, [to, from])
-      end
-
+      connection.query(sql_query, [dst.to_s(), src.to_s()])
+    ensure
+      # Make sure the connection gets closed even if the 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