X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/baea8dc10eb0399e37850cc5ab857f392f780f1f..b87983c2baf55d437c09e668188454d01b5f20b0:/app/models/old_relation.rb?ds=sidebyside diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index d0a03ac25..9f551d839 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -2,7 +2,7 @@ # # Table name: relations # -# relation_id :bigint(8) default(0), not null, primary key +# relation_id :bigint(8) not null, primary key # changeset_id :bigint(8) not null # timestamp :datetime not null # version :bigint(8) not null, primary key @@ -21,23 +21,20 @@ # 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. include Redactable belongs_to :changeset - belongs_to :redaction - belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" + 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] - has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version] + 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, :presence => true, :associated => true + validates :changeset, :associated => true validates :timestamp, :presence => true validates :visible, :inclusion => [true, false] @@ -82,7 +79,7 @@ class OldRelation < ApplicationRecord end def tags - @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end attr_writer :members, :tags @@ -99,7 +96,7 @@ class OldRelation < ApplicationRecord # check whether this element is the latest version - that is, # has the same version as its "current" counterpart. - def is_latest_version? + def latest_version? current_relation.version == version end end