X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=lib%2Fcommon%2Fagendav_plugin.rb;h=187df6e92a695a85aba3091bded527a8ac751038;hb=853aaef812f6e23f17d3e24db99dfbaadafdbddf;hp=4c3a5cff3bc4a1acef6270a8de55ce7d800f5a8d;hpb=f77d8736406afb1fcf017dbc6b2ce780f5cde5be;p=mailshears.git

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index 4c3a5cf..187df6e 100644
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -18,7 +18,6 @@ module AgendavPlugin
       :host     => cfg.agendav_dbhost,
       :port     => cfg.agendav_dbport,
       :options  => cfg.agendav_dbopts,
-      :tty      => cfg.agendav_dbtty,
       :dbname   => cfg.agendav_dbname,
       :user     => cfg.agendav_dbuser,
       :password => cfg.agendav_dbpass }
@@ -35,14 +34,14 @@ module AgendavPlugin
 
     connection = PG::Connection.new(@db_hash)
 
-    # There's also an "owner" field in the "shares" table, but it
-    # contains a principal URL and not a bare username. Thus its
-    # format depends on the CalDAV server configuration, and isn't
-    # predictable.
-    sql_query  = 'SELECT username FROM prefs'
+    # 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
@@ -53,4 +52,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