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

[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..9c8c0c6f3c1de533371bda729e8e185110723986 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
 #


@@ -16,11 +16,11 @@
 #  way_nodes_id_fkey  (way_id => ways.way_id)
 #
 
 #  way_nodes_id_fkey  (way_id => ways.way_id)
 #
 

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

   self.table_name = "way_nodes"
   self.primary_keys = "way_id", "version", "sequence_id"
 
   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