Merge branch 'master' into messages

[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 b0a563ea866dcd74b0ee583da874d423216dff0c..6d24c4598c42af2eb22c98732c05f605f1d6a166 100644 (file)
--- a/app/models/diary_entry_subscription.rb
+++ b/app/models/diary_entry_subscription.rb
@@ -1,4 +1,23 @@
+# == Schema Information
+#
+# Table name: diary_entry_subscriptions
+#
+#  user_id        :integer          not null, primary key
+#  diary_entry_id :integer          not null, primary key
+#
+# Indexes
+#
+#  index_diary_entry_subscriptions_on_diary_entry_id  (diary_entry_id)
+#
+# Foreign Keys
+#
+#  diary_entry_subscriptions_diary_entry_id_fkey  (diary_entry_id => diary_entries.id)
+#  diary_entry_subscriptions_user_id_fkey         (user_id => users.id)
+#
+
 class DiaryEntrySubscription < ActiveRecord::Base
+  self.primary_keys = "user_id", "diary_entry_id"
+
   belongs_to :user
   belongs_to :diary_entry
 end