about summary refs log tree commit diff
path: root/db
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-26 18:17:16 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-26 18:17:16 +0000
commit6b85dba8daf7ddb59063cadfe4e2a6dc071931d5 (patch)
tree9af293d43f7d0685edaaa1a79edb1a68b70ba3bb /db
parentbed13f22e24763620f2c2d3bcbfe15937336fa88 (diff)
parent127bfda521d97fd173acf3c4fdcedcb065f7eefb (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20171226094803_more_faster_index_on_notifications.rb7
-rw-r--r--db/schema.rb4
2 files changed, 9 insertions, 2 deletions
diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
new file mode 100644
index 000000000..b2e53b82d
--- /dev/null
+++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
@@ -0,0 +1,7 @@
+class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.1]
+  def change
+    commit_db_transaction
+    add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently
+    remove_index :notifications, name: :index_notifications_on_id_and_account_id_and_activity_type
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9410cdab5..b480c9c46 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: 20171212195226) do
+ActiveRecord::Schema.define(version: 20171226094803) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -268,8 +268,8 @@ ActiveRecord::Schema.define(version: 20171212195226) do
     t.bigint "account_id"
     t.bigint "from_account_id"
     t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true
+    t.index ["account_id", "id"], name: "index_notifications_on_account_id_and_id", order: { id: :desc }
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
-    t.index ["id", "account_id", "activity_type"], name: "index_notifications_on_id_and_account_id_and_activity_type", order: { id: :desc }
   end
 
   create_table "oauth_access_grants", force: :cascade do |t|