X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4c4150e0d0dc43c0468388956728d8ffc43e6c9c..d67efc31681cec4724d922f63f0c666c47c1cfb0:/app/models/old_relation.rb diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 6f122b260..7d5a3fbb4 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -21,10 +21,7 @@ # class OldRelation < ApplicationRecord - include ConsistencyValidations - self.table_name = "relations" - self.primary_keys = "relation_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 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", :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 + 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 validates :changeset, :associated => true validates :timestamp, :presence => true