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

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 0425fa6b40ae580587ea0ac736c0831f8333fb57..672e6f76ca90c1e6cbdeebeb51d57174e68be239 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,10 +1,26 @@
-class ChangesetTag < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: changeset_tags
+#
+#  changeset_id :bigint(8)        not null, primary key
+#  k            :string           default(""), not null, primary key
+#  v            :string           default(""), not null
+#
+# Indexes
+#
+#  changeset_tags_id_idx  (changeset_id)
+#
+# Foreign Keys
+#
+#  changeset_tags_id_fkey  (changeset_id => changesets.id)
+#
+
+class ChangesetTag < ApplicationRecord
   self.primary_keys = "changeset_id", "k"
 
   belongs_to :changeset
 
-  validates_presence_of :changeset
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :changeset_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  validates :changeset, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => :changeset_id }
 end