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

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

diff --git a/app/models/way_node.rb b/app/models/way_node.rb
index 0788a631c8c9c3969ea79dc84988d81fd61f58b6..c57d3be79a8a4b1651ec24354970e2bcdda2e954 100644 (file)
--- a/app/models/way_node.rb
+++ b/app/models/way_node.rb
@@ -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