Rename all ID columns that aren't unique

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 82cb4cc8d288669fdb82ceca90febdaf41375b30..389e2ce5234cded24bba7548a567e6b7b9dee124 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,10 +1,9 @@
 class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'
-  
-  set_primary_keys :id, :sequence_id
+  set_table_name 'current_relation_members'  
+  set_primary_keys :relation_id, :sequence_id
 
+  belongs_to :relation
   belongs_to :member, :polymorphic => true
-  belongs_to :relation, :foreign_key => :id
 
   after_find :set_class_from_type
   after_initialize :set_class_from_type