X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38640e0253e8984974d275f2c232eb057ba86c84..a0dd71112a910f68383392bc9efaa26b8e042d3e:/app/models/old_relation.rb diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 3470561ce..51aeb9c4c 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -2,10 +2,10 @@ # # Table name: relations # -# relation_id :integer default(0), not null, primary key -# changeset_id :integer not null +# relation_id :bigint(8) default(0), not null, primary key +# changeset_id :bigint(8) not null # timestamp :datetime not null -# version :integer not null, primary key +# version :bigint(8) not null, primary key # visible :boolean default(TRUE), not null # redaction_id :integer # @@ -20,14 +20,14 @@ # relations_redaction_id_fkey (redaction_id => redactions.id) # -class OldRelation < ActiveRecord::Base +class OldRelation < ApplicationRecord include ConsistencyValidations include ObjectMetadata self.table_name = "relations" self.primary_keys = "relation_id", "version" - # note this needs to be included after the table name changes, or + # 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 @@ -83,12 +83,10 @@ class OldRelation < ActiveRecord::Base end def tags - @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }] + @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h end - attr_writer :members - - attr_writer :tags + attr_writer :members, :tags def to_xml doc = OSM::API.new.get_xml_doc