X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fagendav_plugin.rb;h=3b3389dcd074ea4c8b3e666ebf0874b5ec7dfc99;hp=49e7087d996ce2de850a01ec3c6d0a785b0ecd06;hb=refs%2Ftags%2F0.0.4;hpb=b947ef8844f090eedd50be0383abe417d910bb1a

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index 49e7087..3b3389d 100644
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -35,12 +35,14 @@ 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|
+      connection.sync_exec(sql_query) do |result|
         users = result.field_values('username')
       end
     ensure
@@ -51,4 +53,27 @@ module AgendavPlugin
     return users.map{ |u| User.new(u) }
   end
 
+
+  # Count the number of rows in the "shares" table. Used only for
+  # testing.
+  #
+  # @return [Fixnum] the number of rows in the "shares" table.
+  #
+  def count_shares()
+    count = nil
+    connection = PG::Connection.new(@db_hash)
+
+    sql_query  = 'SELECT count(*) FROM shares;'
+    begin
+      connection.sync_exec(sql_query) do |result|
+        count = result.getvalue(0,0).to_i()
+      end
+    ensure
+      # Make sure the connection gets closed even if the query explodes.
+      connection.close()
+    end
+
+    return count
+  end
+
 end