Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md

1 files changed, 12 insertions, 6 deletions

diff --git a/priv/repo/migrations/20190213185503_change_apps_scopes_to_varchar_array.exs b/priv/repo/migrations/20190213185503_change_apps_scopes_to_varchar_array.exs
index 72decd401..eb6fcb012 100644
--- a/priv/repo/migrations/20190213185503_change_apps_scopes_to_varchar_array.exs
+++ b/priv/repo/migrations/20190213185503_change_apps_scopes_to_varchar_array.exs
@@ -4,14 +4,20 @@ defmodule Pleroma.Repo.Migrations.ChangeAppsScopesToVarcharArray do
   @alter_apps_scopes "ALTER TABLE apps ALTER COLUMN scopes"
 
   def up do
-    execute "#{@alter_apps_scopes} TYPE varchar(255)[] USING string_to_array(scopes, ',')::varchar(255)[];"
-    execute "#{@alter_apps_scopes} SET DEFAULT ARRAY[]::character varying[];"
-    execute "#{@alter_apps_scopes} SET NOT NULL;"
+    execute(
+      "#{@alter_apps_scopes} TYPE varchar(255)[] USING string_to_array(scopes, ',')::varchar(255)[];"
+    )
+
+    execute("#{@alter_apps_scopes} SET DEFAULT ARRAY[]::character varying[];")
+    execute("#{@alter_apps_scopes} SET NOT NULL;")
   end
 
   def down do
-    execute "#{@alter_apps_scopes} DROP NOT NULL;"
-    execute "#{@alter_apps_scopes} DROP DEFAULT;"
-    execute "#{@alter_apps_scopes} TYPE varchar(255) USING array_to_string(scopes, ',')::varchar(255);"
+    execute("#{@alter_apps_scopes} DROP NOT NULL;")
+    execute("#{@alter_apps_scopes} DROP DEFAULT;")
+
+    execute(
+      "#{@alter_apps_scopes} TYPE varchar(255) USING array_to_string(scopes, ',')::varchar(255);"
+    )
   end
 end