X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5a8c4faf3ebf4e80bd41b2f281bc3c23309739d5..dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7:/app/models/old_relation_tag.rb diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb index 49324966f..ad3b72734 100644 --- a/app/models/old_relation_tag.rb +++ b/app/models/old_relation_tag.rb @@ -3,9 +3,8 @@ class OldRelationTag < ActiveRecord::Base self.primary_keys = "relation_id", "version", "k" belongs_to :old_relation, :foreign_key => [:relation_id, :version] - - validates_presence_of :old_relation - validates_length_of :k, :maximum => 255, :allow_blank => true - validates_uniqueness_of :k, :scope => [:relation_id, :version] - validates_length_of :v, :maximum => 255, :allow_blank => true + + validates :old_relation, :presence => true, :associated => true + validates :k, :v, :allow_blank => true, :length => { :maximum => 255 } + validates :k, :uniqueness => { :scope => [:relation_id, :version] } end