rails/rails

Bugfix foreign key replacement in inverse association

#31575

bogdan wants to merge bogdan:bugfix-has-many-reattachment into rails:master