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

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

diff --git a/app/models/old_relation_member.rb b/app/models/old_relation_member.rb
index f8d4a359f920cfca74818bb20c935b69deaf8af6..5a11566059c94c5479018928e3a6096567805a71 100644 (file)
--- a/app/models/old_relation_member.rb
+++ b/app/models/old_relation_member.rb
@@ -2,7 +2,7 @@
 #
 # Table name: relation_members
 #
-#  relation_id :bigint(8)        default(0), not null, primary key
+#  relation_id :bigint(8)        not null, primary key
 #  member_type :enum             not null
 #  member_id   :bigint(8)        not null
 #  member_role :string           not null
@@ -15,14 +15,15 @@
 #
 # Foreign Keys
 #
-#  relation_members_id_fkey  (relation_id => relations.relation_id)
+#  relation_members_id_fkey  (["relation_id", "version"] => relations.["relation_id", "version"])
 #
 
-class OldRelationMember < ActiveRecord::Base
+class OldRelationMember < ApplicationRecord
   self.table_name = "relation_members"
-  self.primary_keys = "relation_id", "version", "sequence_id"
 
-  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+  belongs_to :old_relation, :query_constraints => [:relation_id, :version], :inverse_of => :old_members
   # A bit messy, referring to the current tables, should do for the data browser for now
   belongs_to :member, :polymorphic => true
+
+  validates :member_role, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
 end