X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46cd08b1c866162cafa92fb0aa2b38ca6fe1f353..349f5e0655f5026db54e4795e48a688eb2b7a654:/app/models/old_way.rb?ds=sidebyside diff --git a/app/models/old_way.rb b/app/models/old_way.rb index a55d3ed00..0c53f90bd 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -21,8 +21,6 @@ # class OldWay < ApplicationRecord - include ConsistencyValidations - self.table_name = "ways" # NOTE: this needs to be included after the table name changes, or @@ -33,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", :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 + 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 validates :changeset, :associated => true validates :timestamp, :presence => true