X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e57189366c0e4a49cb29658e9bf5985996709a2..c5c344b12c6b538cce39b372079b051a6071c5b0:/app/models/relation_tag.rb diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb index fc0ecdddf..758ed37cc 100644 --- a/app/models/relation_tag.rb +++ b/app/models/relation_tag.rb @@ -2,7 +2,7 @@ # # Table name: current_relation_tags # -# relation_id :integer not null, primary key +# relation_id :bigint(8) not null, primary key # k :string default(""), not null, primary key # v :string default(""), not null # @@ -11,13 +11,13 @@ # current_relation_tags_id_fkey (relation_id => current_relations.id) # -class RelationTag < ActiveRecord::Base +class RelationTag < ApplicationRecord self.table_name = "current_relation_tags" self.primary_keys = "relation_id", "k" belongs_to :relation - validates :relation, :presence => true, :associated => true - validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true + validates :relation, :associated => true + validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true validates :k, :uniqueness => { :scope => :relation_id } end