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

diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index 80ab1b6..4bf6583 100644
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -28,18 +28,34 @@ class AgendavMv
     raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
     raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
-    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;'
-
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
-
-    sql_queries.each do |sql_query|
+    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()])
-    end
 
-    connection.close()
+      # But the "shares" table uses encoded principal URLs. For the
+      # "shares" table, we need to do a find/replace on the username
+      # with its "@" symbol translated to a "%40".
+      encoded_src = src.to_s()['@'] = '%40'
+      encoded_dst = dst.to_s()['@'] = '%40'
+
+      # Unlike in the "rm" plugin, we do modify the "calendar" field
+      # here. That's because in the usual legitimate use case, the
+      # 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 calendar=REPLACE(calendar, $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])
+      end
+    ensure
+      # Make sure the connection gets closed even if a query explodes.
+      connection.close()
+    end
   end
 
 end