Merge remote-tracking branch 'upstream/pull/4897'

[rails.git] / app / models / diary_entry_subscription.rb

diff --git a/app/models/diary_entry_subscription.rb b/app/models/diary_entry_subscription.rb
index 6d24c4598c42af2eb22c98732c05f605f1d6a166..93b8847f433f655ee673ad339053f5dd460ec126 100644 (file)
--- a/app/models/diary_entry_subscription.rb
+++ b/app/models/diary_entry_subscription.rb
@@ -2,8 +2,8 @@
 #
 # Table name: diary_entry_subscriptions
 #
-#  user_id        :integer          not null, primary key
-#  diary_entry_id :integer          not null, primary key
+#  user_id        :bigint(8)        not null, primary key
+#  diary_entry_id :bigint(8)        not null, primary key
 #
 # Indexes
 #
@@ -15,9 +15,7 @@
 #  diary_entry_subscriptions_user_id_fkey         (user_id => users.id)
 #
 
-class DiaryEntrySubscription < ActiveRecord::Base
-  self.primary_keys = "user_id", "diary_entry_id"
-
+class DiaryEntrySubscription < ApplicationRecord
   belongs_to :user
   belongs_to :diary_entry
 end