X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a4edd3fd04b3f97fcff2fd77977fd2e2324f30d8..fd732ee33da48915fc964d45e95d3ce6eaf858be:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index dabf0aafb..8577330c5 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -21,10 +21,7 @@
 #
 
 class OldWay < ApplicationRecord
-  include ConsistencyValidations
-
   self.table_name = "ways"
-  self.primary_keys = "way_id", "version"
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
@@ -34,8 +31,8 @@ class OldWay < ApplicationRecord
   belongs_to :redaction, :optional => true
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
 
-  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version], :inverse_of => :old_way
-  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_nodes, :class_name => "OldWayNode", :query_constraints => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :query_constraints => [:way_id, :version], :inverse_of => :old_way
 
   validates :changeset, :associated => true
   validates :timestamp, :presence => true