X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmv%2Fplugins%2Fagendav.rb;h=a2fb05438dd0cb5808b45d9d64f80d323fa0b037;hp=4bf65834da5de2d071c664fee9d00bc826b6da15;hb=fa7782720ff15fce29b6f875678e9fd0c197485a;hpb=f77d8736406afb1fcf017dbc6b2ce780f5cde5be

diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index 4bf6583..a2fb054 100644
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -15,24 +15,32 @@ class AgendavMv
   # Move the user *src* to *dst* within the Agendav database. This
   # should "rename" him in _every_ table where he is referenced.
   #
-  # This can fail is *src* does not exist, or if *dst* already exists
-  # before the move. It should also be an error if the destination
-  # domain doesn't exist. But Agendav doesn't know about domains, so
-  # we let that slide.
+  # This can fail if *dst* already exists before the move. It should
+  # also be an error if the destination domain doesn't exist. But
+  # Agendav doesn't know about domains, so we let that slide.
+  #
+  # If the source user doesn't exist, we do our best. AgenDAV has a
+  # "shares" table that isn't keyed on the username, but rather the
+  # principal URL. And its "prefs" table doesn't contain entries for
+  # users who have default preferences. As a result, we may need to
+  # perform some find/replaces in the "shares" table even if no
+  # corresponding user exists in the "prefs" table (which is how we
+  # tell if a user exists in AgenDAV). Thus it's not a fatal error if
+  # the *src* user doesn't 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)
     raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
     connection = PG::Connection.new(@db_hash)
     begin
       # The "prefs" table uses the normal username as a key...
-      sql_query = 'UPDATE prefs SET username = $1 WHERE username = $2;'
-      connection.query(sql_query, [dst.to_s(), src.to_s()])
+      # This should be harmless if the source user does not exist.
+      sql_query0 = 'UPDATE prefs SET username = $1 WHERE username = $2;'
+      connection.sync_exec_params(sql_query0, [dst.to_s(), src.to_s()])
 
       # But the "shares" table uses encoded principal URLs. For the
       # "shares" table, we need to do a find/replace on the username
@@ -45,12 +53,12 @@ class AgendavMv
       # calendar URL will change when a user moves. This will ALSO
       # affect people who name their calendars something like
       # "user%40example.com", but screw those people.
-      sql_queries << 'UPDATE shares SET owner=REPLACE(owner, $2, $1);'
+      sql_queries = ['UPDATE shares SET owner=REPLACE(owner, $2, $1);']
       sql_queries << 'UPDATE shares SET calendar=REPLACE(calendar, $2, $1);'
-      sql_queries << 'UPDATE shares SET with=REPLACE(with, $2, $1);'
+      sql_queries << 'UPDATE shares SET "with"=REPLACE("with", $2, $1);'
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [encoded_dst, encoded_src])
+        connection.sync_exec_params(sql_query, [encoded_dst, encoded_src])
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.