lib,test: replace connection query() method with sync_exec{,_params}.

[mailshears.git] / lib / common / agendav_plugin.rb

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index c5e7d7719178dd5035f46b39a2c8cf79c78399ae..3b3389dcd074ea4c8b3e666ebf0874b5ec7dfc99 100644 (file)
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -42,7 +42,7 @@ module AgendavPlugin
     sql_query  = 'SELECT username FROM prefs;'
 
     begin
     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
         users = result.field_values('username')
       end
     ensure


@@ -53,4 +53,27 @@ module AgendavPlugin
     return users.map{ |u| User.new(u) }
   end
 
     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
 end