Stop pretending that we'll ever work with another DBMS.

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

diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index d5858c04c5ae360dff293bcec15f5d66cf26e7e7..ad1e9c2bfcf9f88b6fb67cf893a4c0ecb4d0348a 100644 (file)
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -8,36 +8,27 @@ class AgendavMv
   include AgendavPlugin
   include MvPlugin
 
   include AgendavPlugin
   include MvPlugin
 

+  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, Agendav doesn't know about domains, so we let that slide.
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)

 
 

-  def mv_domain(from, to)
-    # AgenDAV doesn't have a concept of domains.
-  end
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)

 
 

-  def mv_user(from, to)

     sql_queries = ['UPDATE prefs SET username = $1 WHERE username = $2;']
     sql_queries << 'UPDATE shared SET user_from = $1 WHERE user_from = $2;'
     sql_queries << 'UPDATE shared SET user_which = $1 WHERE user_which = $2;'
 
     sql_queries = ['UPDATE prefs SET username = $1 WHERE username = $2;']
     sql_queries << 'UPDATE shared SET user_from = $1 WHERE user_from = $2;'
     sql_queries << 'UPDATE shared SET user_which = $1 WHERE user_which = $2;'
 

-    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.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
 
     end
 

+    connection.close()

   end
 
 end
   end
 
 end