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

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

-  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