Overhaul everything to get consistent error reports.

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

diff --git a/lib/mv/plugins/roundcube.rb b/lib/mv/plugins/roundcube.rb
index 50a52c302cd2a25613f4c463eb5232c7a756b055..4b3ebcb5d20084d8c342445d2b5566a98324d6d5 100644 (file)
--- a/lib/mv/plugins/roundcube.rb
+++ b/lib/mv/plugins/roundcube.rb
@@ -9,11 +9,15 @@ class RoundcubeMv
   include MvPlugin
 
 
-  def mv_domain(from, to)
-    # Roundcube doesn't have a concept of domains.
-  end
+  def mv_user(src, dst)
+    # It's obviously an error if the source user does not exist. It
+    # would also be an error if the destination domain didn't exist;
+    # however, Roundcube doesn't know about domains, so we let that slide.
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
+
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
-  def mv_account(from, to)
     sql_queries = ['UPDATE users SET username = $1 WHERE username = $2;']
 
     begin
@@ -26,7 +30,7 @@ class RoundcubeMv
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [to, from])
+        connection.query(sql_query, [dst.to_s(), src.to_s()])
       end
 
       connection.close()