Merge remote-tracking branch 'osmlab/iD-1.6.0'

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

diff --git a/app/models/way_node.rb b/app/models/way_node.rb
index 957016b9dd6fd91d1b50b7b54faffc060888a66b..30d9013565eb9ebf3c78f795e9a51ae7c84304b4 100644 (file)
--- a/app/models/way_node.rb
+++ b/app/models/way_node.rb
@@ -1,8 +1,7 @@
 class WayNode < ActiveRecord::Base
-  set_table_name 'current_way_nodes'
+  self.table_name = "current_way_nodes"
+  self.primary_keys = "way_id", "sequence_id"
 
-  set_primary_keys :id, :sequence_id
+  belongs_to :way
   belongs_to :node
-
-  belongs_to :way, :foreign_key => :id
 end