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

[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 6234b85c2b48c4baaeb15579623e878a49d19c3e..836e76e47eb112e2764e6fc4c8876ab30cbdff17 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -1,10 +1,27 @@
-class OldWayNode < ActiveRecord::Base
-  set_table_name 'way_nodes'
+# == Schema Information
+#
+# 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
+#
+# Indexes
+#
+#  way_nodes_node_idx  (node_id)
+#
+# Foreign Keys
+#
+#  way_nodes_id_fkey  (way_id => ways.way_id)
+#
 
-  set_primary_keys :id, :version, :sequence_id
+class OldWayNode < ActiveRecord::Base
+  self.table_name = "way_nodes"
+  self.primary_keys = "way_id", "version", "sequence_id"
 
-  belongs_to :way, :foreign_key=> :id
-  
-  # A bit messy, referring to current nodes, should do for the data browser for now
+  belongs_to :old_way, :foreign_key => [:way_id, :version]
+  # A bit messy, referring to current nodes and ways, should do for the data browser for now
   belongs_to :node
+  belongs_to :way
 end