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

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index e5c783f5c68b788e7d5f034970a3a4ebc28acd5e..2b72cd2b182595bd6f6abb2d138559c700572103 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,7 +1,27 @@
-class RelationMember < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: current_relation_members
+#
+#  relation_id :bigint(8)        not null, primary key
+#  member_type :enum             not null
+#  member_id   :bigint(8)        not null
+#  member_role :string           not null
+#  sequence_id :integer          default(0), not null, primary key
+#
+# Indexes
+#
+#  current_relation_members_member_idx  (member_type,member_id)
+#
+# Foreign Keys
+#
+#  current_relation_members_id_fkey  (relation_id => current_relations.id)
+#
+
+class RelationMember < ApplicationRecord

   self.table_name = "current_relation_members"
   self.table_name = "current_relation_members"

-  self.primary_keys = "relation_id", "sequence_id"

 
 

-  belongs_to :relation, :foreign_key => :relation_id
+  belongs_to :relation

   belongs_to :member, :polymorphic => true
   belongs_to :member, :polymorphic => true

+
+  validates :member_role, :allow_blank => true, :length => { :maximum => 255 }, :characters => true

 end
 end