Well Hibernate has saveOrUpdate / save / update, so it's the same

On the hierarchy, I think I know what to do, it's somewhat similar to the delete by term optimization I did. It's hard and a subtle contract which I'm not sure we want to expose at that level.