X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fdavical_plugin.rb;h=06abbfa99e31844b6ae22c5190a828837e59862c;hp=ba09770deee3eff9d8483f76d70e23a5f99dfb2e;hb=HEAD;hpb=adaab0ea0fb8ae690ac7c7d5a69a079467252767 diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb index ba09770..2298a8e 100644 --- a/lib/common/davical_plugin.rb +++ b/lib/common/davical_plugin.rb @@ -18,7 +18,6 @@ module DavicalPlugin :host => cfg.davical_dbhost, :port => cfg.davical_dbport, :options => cfg.davical_dbopts, - :tty => cfg.davical_dbtty, :dbname => cfg.davical_dbname, :user => cfg.davical_dbuser, :password => cfg.davical_dbpass } @@ -55,7 +54,7 @@ module DavicalPlugin sql_query = 'SELECT username FROM usr WHERE user_no > 1;' begin - connection.query(sql_query) do |result| + connection.sync_exec(sql_query) do |result| usernames = result.field_values('username') end ensure @@ -88,7 +87,7 @@ module DavicalPlugin sql_query += 'WHERE usr.username = $1;' begin - connection.query(sql_query, [user.to_s()]) do |result| + connection.sync_exec_params(sql_query, [user.to_s()]) do |result| if result.num_tuples > 0 principal_id = result[0]['principal_id'] end