X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b7b2b502cf2b119208e3c1f79e4a4e38cc0edcc5..036519a4485948fe06fad43e30bbbb3e5df7bb6f:/app/models/relation_tag.rb

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index 812b2ec35..382606795 100644
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -1,10 +1,10 @@
 class RelationTag < ActiveRecord::Base
-  set_table_name 'current_relation_tags'
+  self.table_name = "current_relation_tags"
+  self.primary_keys = "relation_id", "k"
 
-  belongs_to :relation, :foreign_key => 'id'
+  belongs_to :relation
 
-  validates_presence_of :id
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => :k
-  validates_numericality_of :id, :only_integer => true
+  validates :relation, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :relation_id }
 end