The bug was already fixed by 01b9c3d5, so only tests added. At the same time promote_joins()'s uncoditional flag is gone, it isn't needed for anything any more.
