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

[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 ed6de79e45de20ff7fcbc648b845a9c0f12fe652..31a5806ebf924ad8fc5b7c2611885274affd4ea9 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
 #
 #
 # Table name: diary_entry_subscriptions
 #

-#  user_id        :bigint(8)        not null, primary key
-#  diary_entry_id :bigint(8)        not null, primary key
+#  user_id        :bigint           not null, primary key
+#  diary_entry_id :bigint           not null, primary key

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -16,8 +16,6 @@
 #
 
 class DiaryEntrySubscription < ApplicationRecord
 #
 
 class DiaryEntrySubscription < ApplicationRecord

-  self.primary_keys = "user_id", "diary_entry_id"
-

   belongs_to :user
   belongs_to :diary_entry
 end
   belongs_to :user
   belongs_to :diary_entry
 end