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

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

diff --git a/lib/mv/plugins/postfixadmin.rb b/lib/mv/plugins/postfixadmin.rb
index 5cc34e33c6f6134d7512581f639f8da59833639f..f8f86c6ba45236b570e16f9b5c15fa2647aa77b1 100644 (file)
--- a/lib/mv/plugins/postfixadmin.rb
+++ b/lib/mv/plugins/postfixadmin.rb
@@ -3,60 +3,68 @@ require 'pg'
 require 'common/postfixadmin_plugin'
 require 'mv/mv_plugin'
 
+
+# Handle moving (renaming) of users in the Postfixadmin database.
+#
 class PostfixadminMv
 
   include PostfixadminPlugin
   include MvPlugin
 
 
-  def mv_user(user_from, user_to)
-    raise NonexistentUserError.new(user_from) if not user_exists(user_from)
+  # Move the user *src* to *dst* within the Postfixadmin
+  # database. This should "rename" him in _every_ table where he is
+  # referenced. Unfortunately that must be done manually.
+  #
+  # This can fail is *src* does not exist, or if *dst* already exists
+  # before the move. It will also fail if the domain associated with
+  # the user *dst* does not exist.
+  #
+  # @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)
+
+    if not domain_exists(dst.domain())
+      raise NonexistentDomainError.new(dst.domain.to_s())
+    end
 
-    user_to_parts = user_to.split('@')
-    localpart_to = user_to_parts[0]
-    domain_to = user_to_parts[1]
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
-    sql_queries = ['UPDATE mailbox SET username=$1,
-                                       domain=$2,
-                                       maildir=$2/$3/,
-                                       local_part=$3
-                    WHERE username=$4;']
+    mailbox_query  = 'UPDATE mailbox SET '
+    mailbox_query += '  username=$1,'
+    mailbox_query += '  domain=$2,'
+    mailbox_query += "  maildir=CONCAT($2, '/', $3, '/'),"
+    mailbox_query += '  local_part=$3 '
+    mailbox_query += 'WHERE username=$4;'
 
-    sql_queries << 'UPDATE alias SET address=$1,
-                                     domain=$2,
-                                     goto=REPLACE(goto, $4, $1)
-                    WHERE address=$4;'
+    alias_query1  = 'UPDATE alias SET '
+    alias_query1 += '  address=$1,'
+    alias_query1 += '  domain=$2,'
+    alias_query1 += '  goto=REPLACE(goto, $4, $1) '
+    alias_query1 += 'WHERE address=$4;'
 
-    sql_queries << 'UPDATE alias SET goto=REPLACE(GOTO, $4, $1);'
+    alias_query2  = 'UPDATE alias SET '
+    alias_query2 += 'goto=REPLACE(goto, $4, $1);'
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    sql_queries = [mailbox_query, alias_query1, alias_query2]
 
+    connection = PG::Connection.new(@db_hash)
+    begin
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [user_to,
-                                     domain_to,
-                                     localpart_to,
-                                     user_from])
+        varchar = 1043 # from pg_type.h
+        params = [{:value => dst.to_s(), :type => varchar},
+                  {:value => dst.domainpart(), :type => varchar},
+                  {:value => dst.localpart(), :type => varchar},
+                  {:value => src.to_s(), :type => varchar}]
+        connection.query(sql_query, params)
       end
-
+    ensure
+      # Make sure the connection gets closed even if a query explodes.
       connection.close()
-
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
     end
-
-  end
-
-
-  def mv_domain(domain_from, domain_to)
-    raise NotImplementedError
   end
 
 end