X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46cd08b1c866162cafa92fb0aa2b38ca6fe1f353..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/models/old_relation.rb?ds=sidebyside diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 5ff12fd58..9f551d839 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -21,8 +21,6 @@ # class OldRelation < ApplicationRecord - include ConsistencyValidations - self.table_name = "relations" # NOTE: this needs to be included after the table name changes, or @@ -33,8 +31,8 @@ class OldRelation < ApplicationRecord belongs_to :redaction, :optional => true belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations - has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation - has_many :old_tags, :class_name => "OldRelationTag", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation + has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation + has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation validates :changeset, :associated => true validates :timestamp, :presence => true