Attempting to merge a user fails if the user has done a password request previously.

[Steve Callender]

I've checked this in 2.2 and the master code.

The actor.usr_merge function needs to have the actor.usr_password_reset table added to tables it merges. If a user has an entry in that table, the merge will fail on a key violation when the source user is being deleted.

Steve

[Steve Callender (stevecallender)]

Patch for this,

http://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=17189a68b1a600cb70895b591ee23faebb2c47de

[Rogan Hamby (rogan-hamby)]

Current behavior in the web client is that this no longer fails though the password request is not updated. I don't think that's critical to move over and the function in the upgrade script would need to be updated after just shy of 6 years of changes. So, I'm going to mark this as invalid since it does work now.