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

[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 836e76e47eb112e2764e6fc4c8876ab30cbdff17..b2a16c16b39af7cefe8646e0c17bde05953641b3 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -13,14 +13,13 @@
 #
 # Foreign Keys
 #
 #
 # Foreign Keys
 #

-#  way_nodes_id_fkey  (way_id => ways.way_id)
+#  way_nodes_id_fkey  (["way_id", "version"] => ways.["way_id", "version"])

 #
 
 #
 

-class OldWayNode < ActiveRecord::Base
+class OldWayNode < ApplicationRecord

   self.table_name = "way_nodes"
   self.table_name = "way_nodes"

-  self.primary_keys = "way_id", "version", "sequence_id"

 
 

-  belongs_to :old_way, :foreign_key => [:way_id, :version]
+  belongs_to :old_way, :foreign_key => [: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
   # A bit messy, referring to current nodes and ways, should do for the data browser for now
   belongs_to :node
   belongs_to :way