Merge branch 'master' into notes

[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 6ad4b452e4ed50790a340cd4c60a5eb35eb87d10..49324966f506c2624f0055d9f02fc5f82f2e6911 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -1,6 +1,11 @@
 class OldRelationTag < ActiveRecord::Base
-  belongs_to :user
-
-  set_table_name 'relation_tags'
+  self.table_name = "relation_tags"
+  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
 end