Merge branch 'main' into glitch-soc/merge-upstream

5 files changed, 34 insertions, 1 deletions

diff --git a/db/migrate/20220428112511_add_index_statuses_on_account_id.rb b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
new file mode 100644
index 000000000..87a601b72
--- /dev/null
+++ b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexStatusesOnAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, [:account_id], name: :index_statuses_on_account_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
new file mode 100644
index 000000000..26a543087
--- /dev/null
+++ b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
@@ -0,0 +1,7 @@
+class AddIndexStatusesPinsOnStatusId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :status_pins, [:status_id], name: :index_status_pins_on_status_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
new file mode 100644
index 000000000..c260c9732
--- /dev/null
+++ b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexReportsOnAssignedAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :reports, [:assigned_account_id], name: :index_reports_on_assigned_account_id, algorithm: :concurrently, where: 'assigned_account_id IS NOT NULL'
+  end
+end
diff --git a/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
new file mode 100644
index 000000000..aed88cd80
--- /dev/null
+++ b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexReportsOnActionTakenByAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :reports, [:action_taken_by_account_id], name: :index_reports_on_action_taken_by_account_id, algorithm: :concurrently, where: 'action_taken_by_account_id IS NOT NULL'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 241bda8b8..55c5ea74c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_03_16_233212) do
+ActiveRecord::Schema.define(version: 2022_04_28_114902) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -784,6 +784,8 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do
     t.datetime "action_taken_at"
     t.bigint "rule_ids", array: true
     t.index ["account_id"], name: "index_reports_on_account_id"
+    t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)"
+    t.index ["assigned_account_id"], name: "index_reports_on_assigned_account_id", where: "(assigned_account_id IS NOT NULL)"
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
@@ -861,6 +863,7 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do
     t.datetime "created_at", default: -> { "now()" }, null: false
     t.datetime "updated_at", default: -> { "now()" }, null: false
     t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_status_pins_on_status_id"
   end
 
   create_table "status_stats", force: :cascade do |t|
@@ -899,6 +902,7 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do
     t.boolean "trendable"
     t.bigint "ordered_media_attachment_ids", array: true
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
+    t.index ["account_id"], name: "index_statuses_on_account_id"
     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
@@ -1239,4 +1243,5 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do
     ORDER BY (sum(t0.rank)) DESC;
   SQL
   add_index "follow_recommendations", ["account_id"], name: "index_follow_recommendations_on_account_id", unique: true
+
 end