Simplify a number of object model methods

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 79102853e9c218a362a52eedd5acf30b52233e19..aba38511ce5e01399bb702a9ef3115b295cd95fa 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,30 +1,7 @@
 class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"
 
-  # problem with RelationMember is that it may link to any one 
-  # object (a node, a way, another relation), and belongs_to is
-  # not flexible enough for that. So we do this, which is ugly,
-  # but fortunately rails won't actually run the SQL behind that
-  # unless someone really accesses .node, .way, or
-  # .relation - which is what we do below based on member_type.
-  # (and no: the :condition on belongs_to doesn't work here as
-  # it is a condition on the *referenced* object not the 
-  # *referencing* object!)
-  
-  belongs_to :node, :foreign_key => "member_id"
-  belongs_to :way, :foreign_key => "member_id"
-  belongs_to :relation, :foreign_key => "member_id"
-
-  # so we define this "member" function that returns whatever it
-  # is.
- 
-  def member()
-    return (member_type == "node") ? node : (member_type == "way") ? way : relation
-  end
-
-  # NOTE - relations are SUBJECTS of memberships. The fact that nodes, 
-  # ways, and relations can be the OBJECT of a membership,
-  # i.e. a node/way/relation can be referenced throgh a
-  # RelationMember object, is NOT modelled in rails, i.e. these links
-  # have to be resolved manually, on demand. 
+  belongs_to :relation
+  belongs_to :member, :polymorphic => true
 end