From deef740ad4201e9a7db6d9b7411b596ec89c2e89 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 4 Mar 2017 20:38:39 -0500
Subject: [PATCH] Fix quoting issues with the new AgenDAV "with" column.

---
 lib/mv/plugins/agendav.rb | 8 ++++----
 lib/rm/plugins/agendav.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index fc2a5d9..2177009 100644
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -39,8 +39,8 @@ class AgendavMv
     begin
       # The "prefs" table uses the normal username as a key...
       # This should be harmless if the source user does not exist.
-      sql_query = 'UPDATE prefs SET username = $1 WHERE username = $2;'
-      connection.query(sql_query, [dst.to_s(), src.to_s()])
+      sql_query0 = 'UPDATE prefs SET username = $1 WHERE username = $2;'
+      connection.query(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
@@ -53,9 +53,9 @@ 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])
diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 4bf6bc4..e84c4f6 100644
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -35,8 +35,8 @@ class AgendavRm
     # of the user's email address in the "calendar" field happens when
     # he is also the owner, so the calendar does get deleted in the
     # normal situation.
-    sql_queries << "DELETE FROM shares WHERE REPLACE(owner, '%40', '@') ~ $1;"
-    sql_queries << "DELETE FROM shares WHERE REPLACE(with, '%40', '@')  ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(owner,'%40','@')    ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(\"with\",'%40','@') ~ $1;"
 
     connection = PG::Connection.new(@db_hash)
     begin
-- 
2.43.2