summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2021-12-29 18:08:50 -0700
committerSean King <seanking2919@protonmail.com>2021-12-29 18:08:50 -0700
commitffeae7ef2c682dfadc01b4fae01807ad0f026fd4 (patch)
tree35183398384c21975d16264cc43b8efddbe10710 /priv
parent8ef1d8b566147922c93528b0b60d00fb9e63686b (diff)
parent84420d9439bf2bc161507a19778da00b5d990d70 (diff)
downloadpleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.tar.gz
pleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.zip
Fix merge conflict in CHANGELOG.md
Diffstat (limited to 'priv')
-rw-r--r--priv/repo/migrations/20210818023112_add_user_id_to_apps.exs11
-rw-r--r--priv/repo/migrations/20211229075801_user_relationships_target_id_relationship_type_index.exs7
2 files changed, 18 insertions, 0 deletions
diff --git a/priv/repo/migrations/20210818023112_add_user_id_to_apps.exs b/priv/repo/migrations/20210818023112_add_user_id_to_apps.exs
new file mode 100644
index 000000000..88a6bce00
--- /dev/null
+++ b/priv/repo/migrations/20210818023112_add_user_id_to_apps.exs
@@ -0,0 +1,11 @@
+defmodule Pleroma.Repo.Migrations.AddUserIdToApps do
+ use Ecto.Migration
+
+ def change do
+ alter table(:apps) do
+ add(:user_id, references(:users, type: :uuid, on_delete: :delete_all))
+ end
+
+ create_if_not_exists(index(:apps, [:user_id]))
+ end
+end
diff --git a/priv/repo/migrations/20211229075801_user_relationships_target_id_relationship_type_index.exs b/priv/repo/migrations/20211229075801_user_relationships_target_id_relationship_type_index.exs
new file mode 100644
index 000000000..f3eb8409f
--- /dev/null
+++ b/priv/repo/migrations/20211229075801_user_relationships_target_id_relationship_type_index.exs
@@ -0,0 +1,7 @@
+defmodule Pleroma.Repo.Migrations.UserRelationshipsTargetIdRelationshipTypeIndex do
+ use Ecto.Migration
+
+ def change do
+ create_if_not_exists(index(:user_relationships, [:target_id, :relationship_type]))
+ end
+end