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

[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 b556bd13fd5e0d3ba2c123572e967e510230b0ac..5a11566059c94c5479018928e3a6096567805a71 100644 (file)
--- a/app/models/old_relation_member.rb
+++ b/app/models/old_relation_member.rb
@@ -15,14 +15,13 @@
 #
 # Foreign Keys
 #
-#  relation_members_id_fkey  (relation_id => relations.relation_id)
+#  relation_members_id_fkey  (["relation_id", "version"] => relations.["relation_id", "version"])
 #
 
 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], :inverse_of => :old_members
+  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