X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=priv%2Frepo%2Fmigrations%2F20190414125034_migrate_old_bookmarks.exs;h=99102117f1cb99c6f4b32d8edc76f75781c491d5;hb=d536a00d42e2d6747961755fd28f3dd1f646148e;hp=c30c302f7bb88665aa6f3804c5163671137b6925;hpb=6322c1e123c102d603bd9f6e8bd443568c2fd1cb;p=akkoma

diff --git a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
index c30c302f7..99102117f 100644
--- a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
+++ b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
@@ -8,24 +8,28 @@ defmodule Pleroma.Repo.Migrations.MigrateOldBookmarks do
 
   def up do
     query =
-      from(u in User,
+      from(u in "users",
         where: u.local == true,
-        where: fragment("array_length(?, 1)", u.old_bookmarks) > 0,
-        select: %{id: u.id, old_bookmarks: u.old_bookmarks}
+        where: fragment("array_length(?, 1)", u.bookmarks) > 0,
+        select: %{id: u.id, bookmarks: u.bookmarks}
       )
 
-    Repo.transaction(fn ->
-      Repo.stream(query)
-      |> Enum.each(fn user ->
-        Enum.each(user.old_bookmarks, fn id ->
-          activity = Activity.get_create_by_object_ap_id(id)
-          {:ok, _} = Bookmark.create(user.id, activity.id)
-        end)
+    Repo.stream(query)
+    |> Enum.each(fn %{id: user_id, bookmarks: bookmarks} ->
+      Enum.each(bookmarks, fn ap_id ->
+        activity = Activity.get_create_by_object_ap_id(ap_id)
+        unless is_nil(activity), do: {:ok, _} = Bookmark.create(user_id, activity.id)
       end)
     end)
+
+    alter table(:users) do
+      remove(:bookmarks)
+    end
   end
 
   def down do
-    execute("TRUNCATE TABLE bookmarks")
+    alter table(:users) do
+      add(:bookmarks, {:array, :string}, null: false, default: [])
+    end
   end
 end