# But aliases don't need to point to a single user! If our user
# was part of a multi-recipient alias, we want to remove our user
- # from the alias and leave the other recipients. If you're
- # wondering about the leftover double-commas, look towards the end
- # of the function.
- sql_queries << "UPDATE alias SET goto=REPLACE(goto, $1, '');"
+ # from the alias and leave the other recipients.
+ #
+ # We want to delete the comma that precedes/follows the address,
+ # too. Since the address to be replaced can appear at either the
+ # beginning or the end of the list (as well as in the middle), we
+ # have to try to fix both cases: comma before, and comma after.
+ comma_before = "CONCAT(',', $1)"
+ comma_after = "CONCAT($1, ',')"
+ sql_queries << "UPDATE alias SET goto=REPLACE(goto, #{comma_before}, '');"
+ sql_queries << "UPDATE alias SET goto=REPLACE(goto, #{comma_after}, '');"
sql_queries << 'DELETE FROM mailbox WHERE username = $1;'
sql_queries << 'DELETE FROM quota WHERE username = $1;'
# 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|
+ varchar = 1043 # from pg_type.h
+ params = [{:value => user.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
-
- # 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.sync_exec_params(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