summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-08-22 20:59:58 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-08-22 20:59:58 +0300
commit256ff09aa8068166a9f83e3159f060fd4598af76 (patch)
treea5e5efa83241f28d8d241b9d2d95ca4ceaefd286 /priv
parent8778c16dac1789eeb6dd51524573163216200b5d (diff)
parent73884441f31092bdb2f509950daf9bd3889a9a8b (diff)
downloadpleroma-256ff09aa8068166a9f83e3159f060fd4598af76.tar.gz
pleroma-256ff09aa8068166a9f83e3159f060fd4598af76.zip
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs
Diffstat (limited to 'priv')
-rw-r--r--priv/repo/migrations/20190205114625_create_thread_mutes.exs2
-rw-r--r--priv/repo/migrations/20190801154554_create_conversation_participation_recipient_ships.exs13
2 files changed, 14 insertions, 1 deletions
diff --git a/priv/repo/migrations/20190205114625_create_thread_mutes.exs b/priv/repo/migrations/20190205114625_create_thread_mutes.exs
index 7e44db121..baaf07253 100644
--- a/priv/repo/migrations/20190205114625_create_thread_mutes.exs
+++ b/priv/repo/migrations/20190205114625_create_thread_mutes.exs
@@ -6,7 +6,7 @@ defmodule Pleroma.Repo.Migrations.CreateThreadMutes do
add :user_id, references(:users, type: :uuid, on_delete: :delete_all)
add :context, :string
end
-
+
create_if_not_exists unique_index(:thread_mutes, [:user_id, :context], name: :unique_index)
end
end
diff --git a/priv/repo/migrations/20190801154554_create_conversation_participation_recipient_ships.exs b/priv/repo/migrations/20190801154554_create_conversation_participation_recipient_ships.exs
new file mode 100644
index 000000000..c6e3469d5
--- /dev/null
+++ b/priv/repo/migrations/20190801154554_create_conversation_participation_recipient_ships.exs
@@ -0,0 +1,13 @@
+defmodule Pleroma.Repo.Migrations.CreateConversationParticipationRecipientShips do
+ use Ecto.Migration
+
+ def change do
+ create_if_not_exists table(:conversation_participation_recipient_ships) do
+ add(:user_id, references(:users, type: :uuid, on_delete: :delete_all))
+ add(:participation_id, references(:conversation_participations, on_delete: :delete_all))
+ end
+
+ create_if_not_exists index(:conversation_participation_recipient_ships, [:user_id])
+ create_if_not_exists index(:conversation_participation_recipient_ships, [:participation_id])
+ end
+end