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

[rails.git] / app / models / way_node.rb

diff --git a/app/models/way_node.rb b/app/models/way_node.rb
index 5c09cd740cefc92b442ed4dcff59733e6c310aa6..c57d3be79a8a4b1651ec24354970e2bcdda2e954 100644 (file)
--- a/app/models/way_node.rb
+++ b/app/models/way_node.rb
@@ -2,9 +2,9 @@
 #
 # Table name: current_way_nodes
 #
 #
 # Table name: current_way_nodes
 #

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

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -16,9 +16,8 @@
 #  current_way_nodes_node_id_fkey  (node_id => current_nodes.id)
 #
 
 #  current_way_nodes_node_id_fkey  (node_id => current_nodes.id)
 #
 

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

   self.table_name = "current_way_nodes"
   self.table_name = "current_way_nodes"

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

 
   belongs_to :way
   belongs_to :node
 
   belongs_to :way
   belongs_to :node