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

[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 4264e022164d8a0acbaed1c3719f21be957c0fc3..6d5aaf5c9653861db673981fd73b5eb5fcba12c6 100644 (file)
--- a/app/models/old_relation_member.rb
+++ b/app/models/old_relation_member.rb
@@ -20,9 +20,8 @@
 
 class OldRelationMember < ApplicationRecord
   self.table_name = "relation_members"
 
 class OldRelationMember < ApplicationRecord
   self.table_name = "relation_members"

-  self.primary_key = %w[relation_id version sequence_id]

 
 

-  belongs_to :old_relation, :query_constraints => [:relation_id, :version], :inverse_of => :old_members
+  belongs_to :old_relation, :foreign_key => [: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
 
   # A bit messy, referring to the current tables, should do for the data browser for now
   belongs_to :member, :polymorphic => true