From 816284d73924ceb453c76d571bcb315be91b2b08 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 3 Dec 2016 18:21:26 +0100 Subject: Fix #248 - Reload all accounts when fetching from cache --- .../20161203164520_add_from_account_id_to_notifications.rb | 14 ++++++++++++++ db/schema.rb | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20161203164520_add_from_account_id_to_notifications.rb (limited to 'db') diff --git a/db/migrate/20161203164520_add_from_account_id_to_notifications.rb b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb new file mode 100644 index 000000000..295f95599 --- /dev/null +++ b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb @@ -0,0 +1,14 @@ +class AddFromAccountIdToNotifications < ActiveRecord::Migration[5.0] + def up + add_column :notifications, :from_account_id, :integer, null: false, default: 1 + + Notification.where(activity_type: 'Status').update_all('from_account_id = (SELECT statuses.account_id FROM notifications AS notifications1 INNER JOIN statuses ON notifications1.activity_id = statuses.id WHERE notifications1.activity_type = \'Status\' AND notifications1.id = notifications.id)') + Notification.where(activity_type: 'Mention').update_all('from_account_id = (SELECT statuses.account_id FROM notifications AS notifications1 INNER JOIN mentions ON notifications1.activity_id = mentions.id INNER JOIN statuses ON mentions.status_id = statuses.id WHERE notifications1.activity_type = \'Mention\' AND notifications1.id = notifications.id)') + Notification.where(activity_type: 'Favourite').update_all('from_account_id = (SELECT favourites.account_id FROM notifications AS notifications1 INNER JOIN favourites ON notifications1.activity_id = favourites.id WHERE notifications1.activity_type = \'Favourite\' AND notifications1.id = notifications.id)') + Notification.where(activity_type: 'Follow').update_all('from_account_id = (SELECT follows.account_id FROM notifications AS notifications1 INNER JOIN follows ON notifications1.activity_id = follows.id WHERE notifications1.activity_type = \'Follow\' AND notifications1.id = notifications.id)') + end + + def down + remove_column :notifications, :from_account_id + end +end diff --git a/db/schema.rb b/db/schema.rb index f9080ae2d..c9676ca40 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: 20161202132159) do +ActiveRecord::Schema.define(version: 20161203164520) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -100,8 +100,9 @@ ActiveRecord::Schema.define(version: 20161202132159) do t.integer "account_id" t.integer "activity_id" t.string "activity_type" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "from_account_id", default: 1, null: false t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true, using: :btree end -- cgit