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

[mailshears.git] / lib / mv / plugins / postfixadmin.rb

diff --git a/lib/mv/plugins/postfixadmin.rb b/lib/mv/plugins/postfixadmin.rb
index e22df6a53f7637945460ae3b61063fe8843278d3..1623118109a9033fd9e01bd75ee5ba737dfcfa8f 100644 (file)
--- a/lib/mv/plugins/postfixadmin.rb
+++ b/lib/mv/plugins/postfixadmin.rb
@@ -51,20 +51,20 @@ class PostfixadminMv
 
     sql_queries = [mailbox_query, alias_query1, alias_query2]
 
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
-
-    sql_queries.each do |sql_query|
-      varchar = 1043 # from pg_type.h
-      params = [{:value => dst.to_s(), :type => varchar},
-                {:value => dst.domainpart(), :type => varchar},
-                {:value => dst.localpart(), :type => varchar},
-                {:value => src.to_s(), :type => varchar}]
-
-      connection.query(sql_query, params)
+    connection = PG::Connection.new(@db_hash)
+    begin
+      sql_queries.each do |sql_query|
+        varchar = 1043 # from pg_type.h
+        params = [{:value => dst.to_s(), :type => varchar},
+                  {:value => dst.domainpart(), :type => varchar},
+                  {:value => dst.localpart(), :type => varchar},
+                  {:value => src.to_s(), :type => varchar}]
+        connection.sync_exec_params(sql_query, params)
+      end
+    ensure
+      # Make sure the connection gets closed even if a query explodes.
+      connection.close()
     end
-
-    connection.close()
   end
 
 end