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

[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..714b38648de0d13b304132e7131064e023912f06 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -2,10 +2,10 @@
 #
 # Table name: way_nodes
 #
-#  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
+#  way_id      :bigint           not null, primary key
+#  node_id     :bigint           not null
+#  version     :bigint           not null, primary key
+#  sequence_id :bigint           not null, primary key
 #
 # Indexes
 #
@@ -13,12 +13,11 @@
 #
 # 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
   # A bit messy, referring to current nodes and ways, should do for the data browser for now