[#468] OAuth scopes-related data migration simplification.

2 files changed, 11 insertions, 28 deletions

diff --git a/priv/repo/migrations/20190209123318_data_migration_populate_o_auth_scopes.exs b/priv/repo/migrations/20190209123318_data_migration_populate_o_auth_scopes.exs
deleted file mode 100644
index 30b10f56f..000000000
--- a/priv/repo/migrations/20190209123318_data_migration_populate_o_auth_scopes.exs
+++ /dev/null
@@ -1,28 +0,0 @@
-defmodule Pleroma.Repo.Migrations.DataMigrationPopulateOAuthScopes do
-  use Ecto.Migration
-
-  require Ecto.Query
-
-  alias Ecto.Query
-  alias Pleroma.Repo
-  alias Pleroma.Web.OAuth
-  alias Pleroma.Web.OAuth.{App, Authorization, Token}
-
-  def up do
-    for app <- Repo.all(Query.from(app in App)) do
-      scopes = OAuth.parse_scopes(app.scopes)
-
-      Repo.update_all(
-        Query.from(auth in Authorization, where: auth.app_id == ^app.id),
-        set: [scopes: scopes]
-      )
-
-      Repo.update_all(
-        Query.from(token in Token, where: token.app_id == ^app.id),
-        set: [scopes: scopes]
-      )
-    end
-  end
-
-  def down, do: :noop
-end
diff --git a/priv/repo/migrations/20190213185600_data_migration_populate_o_auth_scopes.exs b/priv/repo/migrations/20190213185600_data_migration_populate_o_auth_scopes.exs
new file mode 100644
index 000000000..7afbcbd76
--- /dev/null
+++ b/priv/repo/migrations/20190213185600_data_migration_populate_o_auth_scopes.exs
@@ -0,0 +1,11 @@
+defmodule Pleroma.Repo.Migrations.DataMigrationPopulateOAuthScopes do
+  use Ecto.Migration
+
+  def up do
+    for t <- [:oauth_authorizations, :oauth_tokens] do
+      execute "UPDATE #{t} SET scopes = apps.scopes FROM apps WHERE #{t}.app_id = apps.id;"
+    end
+  end
+
+  def down, do: :noop
+end