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

diff --git a/lib/mv/plugins/davical.rb b/lib/mv/plugins/davical.rb
index 63c185c..20c8a32 100644
--- a/lib/mv/plugins/davical.rb
+++ b/lib/mv/plugins/davical.rb
@@ -12,37 +12,29 @@ class DavicalMv
   include MvPlugin
 
 
-  def mv_domain(from, to)
-    # DAViCal doesn't have a concept of domains.
-  end
-
-
-  def mv_user(from, to)
-    # Delete the given username. DAViCal uses foreign keys properly
+  def mv_user(src, dst)
+    # Switch the given usernames. 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']
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    # 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, DAViCal 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)
 
-      sql_queries.each do |sql_query|
-        connection.query(sql_query, [to, from])
-      end
+    sql_queries = ['UPDATE usr 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