Merge remote-tracking branch 'upstream/pull/1801'

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

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index 939165ebd30f9cc136a12d77f4b013165bf0be27..5dc609987370ffbc3731e9f6864fc5b155f65f6a 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -1,6 +1,23 @@
+# == Schema Information
+#
+# Table name: current_relation_tags
+#
+#  relation_id :integer          not null, primary key
+#  k           :string           default(""), not null, primary key
+#  v           :string           default(""), not null
+#
+# Foreign Keys
+#
+#  current_relation_tags_id_fkey  (relation_id => current_relations.id)
+#
+
 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 :relation, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :relation_id }
 end