X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmv%2Fplugins%2Froundcube.rb;h=7f345a4a70bb73094d02110ce8f6ff05d6a315e5;hp=bac8344607d925c26f8652aa9a141ff87eee736c;hb=20b843bddcd73833d41f98ff79d92ef59bb4d81e;hpb=72696d3f6e95ef773af9727e9c3459b9038b0fc2

diff --git a/lib/mv/plugins/roundcube.rb b/lib/mv/plugins/roundcube.rb
index bac8344..7f345a4 100644
--- a/lib/mv/plugins/roundcube.rb
+++ b/lib/mv/plugins/roundcube.rb
@@ -9,33 +9,25 @@ class RoundcubeMv
   include MvPlugin
 
 
-  def mv_domain(from, to)
-    # Roundcube doesn't have a concept of domains.
-  end
-
-  def mv_user(from, to)
-    sql_queries = ['UPDATE users SET username = $1 WHERE username = $2;']
+  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)
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
-      sql_queries.each do |sql_query|
-        connection.query(sql_query, [to, from])
-      end
+    sql_queries = ['UPDATE users SET username = $1 WHERE username = $2;']
 
-      connection.close()
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-    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, [dst.to_s(), src.to_s()])
     end
 
+    connection.close()
   end
 
 end