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

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

diff --git a/app/models/way_node.rb b/app/models/way_node.rb
index 957016b9dd6fd91d1b50b7b54faffc060888a66b..0626fb2403df19b013700617421c5accfd12c296 100644 (file)
--- a/app/models/way_node.rb
+++ b/app/models/way_node.rb
@@ -1,8 +1,25 @@
-class WayNode < ActiveRecord::Base
-  set_table_name 'current_way_nodes'
+# == Schema Information
+#
+# Table name: current_way_nodes
+#
+#  way_id      :bigint(8)        not null, primary key
+#  node_id     :bigint(8)        not null
+#  sequence_id :bigint(8)        not null, primary key
+#
+# Indexes
+#
+#  current_way_nodes_node_idx  (node_id)
+#
+# Foreign Keys
+#
+#  current_way_nodes_id_fkey       (way_id => current_ways.id)
+#  current_way_nodes_node_id_fkey  (node_id => current_nodes.id)
+#

 
 

-  set_primary_keys :id, :sequence_id
-  belongs_to :node
+class WayNode < ApplicationRecord
+  self.table_name = "current_way_nodes"
+  self.primary_keys = "way_id", "sequence_id"

 
 

-  belongs_to :way, :foreign_key => :id
+  belongs_to :way
+  belongs_to :node

 end
 end