diff options
| author | lain <lain@soykaf.club> | 2020-04-14 13:17:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-14 13:17:44 +0000 |
| commit | 13a7105b21c1ea41e59b8d2ec36453bd08624867 (patch) | |
| tree | fbd1f97f24894aff45f967aefec42e038c6257f8 | |
| parent | 5fc6ce30ac7c5e4d7e96bad22e6789cb2040fdbd (diff) | |
| parent | d8b12ffd5909a2698cce50d81b69f00b8893d41b (diff) | |
Merge branch 'marker-update-fix' into 'develop'
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
| -rw-r--r-- | priv/repo/migrations/20200210050658_update_markers.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/repo/migrations/20200210050658_update_markers.exs b/priv/repo/migrations/20200210050658_update_markers.exs index b280e156c..db7a355ec 100644 --- a/priv/repo/migrations/20200210050658_update_markers.exs +++ b/priv/repo/migrations/20200210050658_update_markers.exs @@ -32,7 +32,7 @@ defmodule Pleroma.Repo.Migrations.UpdateMarkers do end) Repo.insert_all("markers", markers_attrs, - on_conflict: {:replace, [:last_read_id, :unread_count]}, + on_conflict: {:replace, [:last_read_id]}, conflict_target: [:user_id, :timeline] ) end |