Merge remote-tracking branch 'upstream/pull/2915' into master

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

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index c665cfef66e0fb19896731d29776d3695715b153..ad9a932661bddc63e75eeb428fe00330c327e47b 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -1,11 +1,23 @@
-class RelationTag < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: current_relation_tags
+#
+#  relation_id :bigint(8)        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 < ApplicationRecord
   self.table_name = "current_relation_tags"
   self.primary_keys = "relation_id", "k"
 
   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
+  validates :relation, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => :relation_id }
 end