Refactor storage using Diesel 2's upsert clauses
Since !346 we have Diesel 2, but many store.rs calls still use manual insert-on-update-failure, instead of upsert.
issue