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

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index c9caa1b8544c67e53736d887a7c5e6db2d378f79..eed917eee3c868d2bf6ec19deb258c4481bc54f7 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -2,18 +2,18 @@
 #
 # Table name: note_comments
 #
 #
 # Table name: note_comments
 #

-#  id         :integer          not null, primary key
-#  note_id    :integer          not null
+#  id         :bigint(8)        not null, primary key
+#  note_id    :bigint(8)        not null

 #  visible    :boolean          not null
 #  created_at :datetime         not null
 #  author_ip  :inet
 #  visible    :boolean          not null
 #  created_at :datetime         not null
 #  author_ip  :inet

-#  author_id  :integer
+#  author_id  :bigint(8)

 #  body       :text
 #  event      :enum
 #
 # Indexes
 #
 #  body       :text
 #  event      :enum
 #
 # Indexes
 #

-#  index_note_comments_on_body        (to_tsvector('english'::regconfig, body))
+#  index_note_comments_on_body        (to_tsvector('english'::regconfig, body)) USING gin

 #  index_note_comments_on_created_at  (created_at)
 #  note_comments_note_id_idx          (note_id)
 #
 #  index_note_comments_on_created_at  (created_at)
 #  note_comments_note_id_idx          (note_id)
 #


@@ -23,18 +23,17 @@
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 

-class NoteComment < ActiveRecord::Base
-  belongs_to :note, :foreign_key => :note_id, :touch => true
-  belongs_to :author, :class_name => "User", :foreign_key => :author_id
+class NoteComment < ApplicationRecord
+  belongs_to :note, :touch => true
+  belongs_to :author, :class_name => "User"

 
   validates :id, :uniqueness => true, :presence => { :on => :update },
 
   validates :id, :uniqueness => true, :presence => { :on => :update },

-                 :numericality => { :on => :update, :integer_only => true }
+                 :numericality => { :on => :update, :only_integer => true }

   validates :note, :presence => true, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]
   validates :note, :presence => true, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]

-  validates :body, :allow_blank => false, :length => { :maximum => 2000 },
-                   :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
+  validates :body, :length => { :maximum => 2000 }, :characters => true

 
   # Return the comment text
   def body
 
   # Return the comment text
   def body