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

[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 9c8c0c6f3c1de533371bda729e8e185110723986..e031aba10f2bd47f269e5eea19eb5958dffe7cb1 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -13,14 +13,13 @@
 #
 # Foreign Keys
 #
-#  way_nodes_id_fkey  (way_id => ways.way_id)
+#  way_nodes_id_fkey  (["way_id", "version"] => ways.["way_id", "version"])
 #
 
 class OldWayNode < ApplicationRecord
   self.table_name = "way_nodes"
-  self.primary_keys = "way_id", "version", "sequence_id"
 
-  belongs_to :old_way, :foreign_key => [:way_id, :version], :inverse_of => :old_nodes
+  belongs_to :old_way, :query_constraints => [:way_id, :version], :inverse_of => :old_nodes
   # A bit messy, referring to current nodes and ways, should do for the data browser for now
   belongs_to :node
   belongs_to :way