Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index 939165ebd30f9cc136a12d77f4b013165bf0be27..c665cfef66e0fb19896731d29776d3695715b153 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -1,6 +1,11 @@
 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 :relation
+  validates_length_of :k, :maximum => 255, :allow_blank => true
+  validates_uniqueness_of :k, :scope => :relation_id
+  validates_length_of :v, :maximum => 255, :allow_blank => true
 end