Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb
index 6234b85c2b48c4baaeb15579623e878a49d19c3e..23ff503edf665ff922e6fe4b874f5484734f488f 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -1,10 +1,9 @@
 class OldWayNode < ActiveRecord::Base
-  set_table_name 'way_nodes'
+  self.table_name = "way_nodes"
+  self.primary_keys = "way_id", "version", "sequence_id"
 
-  set_primary_keys :id, :version, :sequence_id
-
-  belongs_to :way, :foreign_key=> :id
-  
-  # A bit messy, referring to current nodes, should do for the data browser for now
+  belongs_to :old_way, :foreign_key => [:way_id, :version]
+  # A bit messy, referring to current nodes and ways, should do for the data browser for now
   belongs_to :node
+  belongs_to :way
 end