# 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;'
begin
sql_queries.each do |sql_query|
- connection.query(sql_query, [user.to_s()])
+ varchar = 1043 # from pg_type.h
+ params = [{:value => user.to_s(), :type => varchar}]
+ connection.query(sql_query, params)
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()
# +-------------------+-------------+------------+
#
#
- # +------------------------------------------------------+
- # | alias |
- # +-------------------+-------------------+--------------+
- # | address | goto | domain |
- # +-------------------+-------------------+--------------+
- # | alice@example.com | alice@example.com | example.com |
- # +-------------------+-------------------+--------------+
- # | bob@example.com | bob@example.com | example.com |
- # +-------------------+-------------------+--------------+
- # | adam@example.net | adam@example.net | example.net |
- # +-------------------+-------------------+--------------+
- # | beth@example.net | beth@example.net | example.net |
- # +-------------------+-------------------+--------------+
- # | carol@example.net | carol@example.net | example.net |
- # +-------------------+-------------------+--------------+
+ # +-------------------------------------------------------+
+ # | alias |
+ # +-------------------+--------------------+--------------+
+ # | address | goto | domain |
+ # +-------------------+--------------------+--------------+
+ # | alice@example.com | alice@example.com, | example.com |
+ # | | adam@example.net, | |
+ # | | bob@example.com, | |
+ # | | carol@example.net | |
+ # +-------------------+--------------------+--------------+
+ # | bob@example.com | bob@example.com | example.com |
+ # +-------------------+--------------------+--------------+
+ # | adam@example.net | adam@example.net | example.net |
+ # +-------------------+--------------------+--------------+
+ # | beth@example.net | beth@example.net | example.net |
+ # +-------------------+--------------------+--------------+
+ # | carol@example.net | carol@example.net | example.net |
+ # +-------------------+--------------------+--------------+
#
#
# +---------------------------------+
VALUES ('carol@example.net', 'example.net', 'carol');
/* Each mailbox has an alias pointing to (at least) itself. */
-INSERT INTO alias (address, goto, domain)
- VALUES ('alice@example.com', 'alice@example.com', 'example.com');
INSERT INTO alias (address, goto, domain)
VALUES ('bob@example.com', 'bob@example.com', 'example.com');
-
INSERT INTO alias (address, goto, domain)
VALUES ('adam@example.net', 'adam@example.net', 'example.net');
INSERT INTO alias (address, goto, domain)
INSERT INTO alias (address, goto, domain)
VALUES ('carol@example.net', 'carol@example.net', 'example.net');
+/* Alice is aliased to some other people, too. */
+INSERT INTO alias (address, goto, domain)
+ VALUES
+ ('alice@example.com',
+ 'alice@example.com,adam@example.net,bob@example.com,carol@example.net',
+ 'example.com');
+
/* Create a domain admin for both example.com and example.net. */
INSERT INTO domain_admins (username, domain)
VALUES ('admin@example.com', 'example.com');
assert_equal(expected.sort(), actual.sort())
actual = pfamv.list_aliases()
- expected = [{'address' => 'alice@example.net',
- 'goto' => 'alice@example.net'},
- {'address' => 'bob@example.com',
- 'goto' => 'bob@example.com'},
- {'address' => 'adam@example.net',
+ expected = [{'address' => 'adam@example.net',
'goto' => 'adam@example.net'},
+ {'address' => 'alice@example.net',
+ 'goto' => 'alice@example.net,' +
+ 'adam@example.net,' +
+ 'bob@example.com,' +
+ 'carol@example.net'},
{'address' => 'beth@example.net',
- 'goto' => 'beth@example.net'},
+ 'goto' => 'beth@example.net'},
+ {'address' => 'bob@example.com',
+ 'goto' => 'bob@example.com'},
{'address' => 'carol@example.net',
'goto' => 'carol@example.net'}]
expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
assert_equal(expected.sort(), actual.sort())
actual = pfamv.list_aliases()
- expected = [{'address' => 'alice@example.com',
- 'goto' => 'alice@example.com'},
- {'address' => 'bob@example.com',
- 'goto' => 'bob@example.com'},
- {'address' => 'adam@example.net',
+ expected = [{'address' => 'adam@example.net',
'goto' => 'adam@example.net'},
+ {'address' => 'alice@example.com',
+ 'goto' => 'alice@example.com,' +
+ 'adam@example.net,' +
+ 'bob@example.com,' +
+ 'carol@example.net'},
{'address' => 'beth@example.net',
- 'goto' => 'beth@example.net'},
+ 'goto' => 'beth@example.net'},
+ {'address' => 'bob@example.com',
+ 'goto' => 'bob@example.com'},
{'address' => 'carol@example.net',
'goto' => 'carol@example.net'}]
expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
assert_equal(expected, actual)
actual = pfapr.list_aliases()
- expected = [{'address' => 'alice@example.com',
- 'goto' => 'alice@example.com'},
- {'address' => 'bob@example.com',
- 'goto' => 'bob@example.com'},
- {'address' => 'adam@example.net',
- 'goto' => 'adam@example.net'},
+ expected = [{'address' => 'adam@example.net',
+ 'goto' => 'adam@example.net'},
+ {'address' => 'alice@example.com',
+ 'goto' => 'alice@example.com,' +
+ 'adam@example.net,' +
+ 'bob@example.com,' +
+ 'carol@example.net'},
{'address' => 'beth@example.net',
- 'goto' => 'beth@example.net'},
+ 'goto' => 'beth@example.net'},
+ {'address' => 'bob@example.com',
+ 'goto' => 'bob@example.com'},
{'address' => 'carol@example.net',
- 'goto' => 'carol@example.net'}]
- assert_equal(expected, actual)
+ 'goto' => 'carol@example.net'}]
+ expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
+ actual.each { |a| assert(expected.include?(a)) } # can't sort dicts
rpr = RoundcubePrune.new(cfg)
actual = rpr.list_users()
actual = pfarm.list_aliases()
expected = [{'address' => 'alice@example.com',
- 'goto' => 'alice@example.com'},
- {'address' => 'bob@example.com',
- 'goto' => 'bob@example.com'},
+ 'goto' => 'alice@example.com,' +
+ 'bob@example.com,' +
+ 'carol@example.net'},
{'address' => 'beth@example.net',
- 'goto' => 'beth@example.net'},
+ 'goto' => 'beth@example.net'},
+ {'address' => 'bob@example.com',
+ 'goto' => 'bob@example.com'},
{'address' => 'carol@example.net',
- 'goto' => 'carol@example.net'}]
- assert_equal(expected, actual)
+ 'goto' => 'carol@example.net'}]
+ expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
+ actual.each { |a| assert(expected.include?(a)) } # can't sort dicts
rrm = RoundcubeRm.new(cfg)
actual = rrm.list_users()
actual = pfarm.list_aliases()
expected = [{'address' => 'alice@example.com',
- 'goto' => 'alice@example.com'},
+ 'goto' => 'alice@example.com,bob@example.com'},
{'address' => 'bob@example.com',
- 'goto' => 'bob@example.com'}]
- assert_equal(expected, actual)
+ 'goto' => 'bob@example.com'}]
+ expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
+ actual.each { |a| assert(expected.include?(a)) } # can't sort dicts
rrm = RoundcubeRm.new(cfg)
actual = rrm.list_users()
projects / mailshears.git / commitdiff