X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fagendav_plugin.rb;h=c5e7d7719178dd5035f46b39a2c8cf79c78399ae;hp=49e7087d996ce2de850a01ec3c6d0a785b0ecd06;hb=579a22471329c71552bcb4077a0590d60cdec784;hpb=b947ef8844f090eedd50be0383abe417d910bb1a

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index 49e7087..c5e7d77 100644
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -35,9 +35,11 @@ module AgendavPlugin
 
     connection = PG::Connection.new(@db_hash)
 
-    sql_query  = '(SELECT username FROM prefs)'
-    sql_query += 'UNION'
-    sql_query += '(SELECT user_from FROM shared);'
+    # There are also "owner" and "with" fields in the "shares" table,
+    # but they contains principal URLs and not a bare username. Thus
+    # their format depends on the CalDAV server configuration, and
+    # isn't predictable.
+    sql_query  = 'SELECT username FROM prefs;'
 
     begin
       connection.query(sql_query) do |result|