Merge branch 'pull/5716'

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 7ffba0dc3350c0348c094d4b7ddd0e8893fbeea4..6b848e1c98f7db33ce181385b2873b7bc940c51d 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,9 +1,20 @@
-class ChangesetTag < ActiveRecord::Base
-  self.primary_keys = "changeset_id", "k"
+# == Schema Information
+#
+# Table name: changeset_tags
+#
+#  changeset_id :bigint           not null, primary key
+#  k            :string           default(""), not null, primary key
+#  v            :string           default(""), not null
+#
+# Foreign Keys
+#
+#  changeset_tags_id_fkey  (changeset_id => changesets.id)
+#
 
+class ChangesetTag < ApplicationRecord
   belongs_to :changeset
 
-  validates :changeset, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :changeset, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :changeset_id }
 end