Merge remote-tracking branch 'openstreetmap/pull/1004'

[rails.git] / app / models / old_relation_tag.rb

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index 49324966f506c2624f0055d9f02fc5f82f2e6911..ad3b72734aed707bfebc87c4c26562690fa5f9c6 100644 (file)
--- 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