# Should be handled by a trigger, according to PostfixAdmin code.
sql_queries << 'DELETE FROM vacation_notification WHERE on_vacation = $1;'
- connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
- @db_name, @db_user, @db_pass)
-
- sql_queries.each do |sql_query|
- connection.query(sql_query, [user.to_s()])
+ connection = PG::Connection.new(@db_hash)
+
+ begin
+ sql_queries.each do |sql_query|
+ connection.query(sql_query, [user.to_s()])
+ end
+
+ # The earlier alias update query will leave things like
+ # "foo@example.com,,bar@example.com" in the "goto" column. Now
+ # we fix it. We don't do it in the loop because query() craps
+ # out on the superfluous parameter.
+ sql_query = "UPDATE alias SET goto=REPLACE(goto, ',,', ',');"
+ connection.query(sql_query)
+ ensure
+ # Make sure the connection gets closed even if a query explodes.
+ connection.close()
end
-
- # The earlier alias update query will leave things like
- # "foo@example.com,,bar@example.com" in the "goto" column. Now
- # we fix it. We don't do it in the loop because query() craps
- # out on the superfluous parameter.
- sql_query = "UPDATE alias SET goto=REPLACE(goto, ',,', ',');"
- connection.query(sql_query)
-
- connection.close()
end
sql_queries << 'DELETE FROM vacation WHERE domain = $1;'
sql_queries << 'DELETE FROM domain WHERE domain = $1;'
- connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
- @db_name, @db_user, @db_pass)
+ connection = PG::Connection.new(@db_hash)
- sql_queries.each do |sql_query|
- connection.query(sql_query, [domain.to_s()])
+ begin
+ sql_queries.each do |sql_query|
+ connection.query(sql_query, [domain.to_s()])
+ end
+ ensure
+ # Make sure the connection gets closed even if a query explodes.
+ connection.close()
end
-
- connection.close()
end
end