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

[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 e1627d3faa3091c002bef4fbb2b0f07a56fd2492..b2a16c16b39af7cefe8646e0c17bde05953641b3 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -2,10 +2,10 @@
 #
 # Table name: way_nodes
 #
 #
 # Table name: way_nodes
 #

-#  way_id      :integer          not null, primary key
-#  node_id     :integer          not null
-#  version     :integer          not null, primary key
-#  sequence_id :integer          not null, primary key
+#  way_id      :bigint(8)        not null, primary key
+#  node_id     :bigint(8)        not null
+#  version     :bigint(8)        not null, primary key
+#  sequence_id :bigint(8)        not null, primary key

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -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