jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3077 from evazion/fix-dmail-title-search

Browse Source 
Fix case sensitivity bug in dmail title search.
This commit is contained in:
Albert Yi
2017-05-22 11:59:22 -07:00
committed by GitHub
parent 582666cc7f c31d11b095
commit 3be06364fa
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ban.rb
View File

@@ -19,7 +19,7 @@ class Ban < ActiveRecord::Base
def self.reason_matches(query) def self.reason_matches(query)
if query =~ /\*/ if query =~ /\*/
where("lower(bans.reason) LIKE ?", query.to_escaped_for_sql_like) where("lower(bans.reason) LIKE ?", query.mb_chars.downcase.to_escaped_for_sql_like)
else else
where("bans.reason @@ plainto_tsquery(?)", query) where("bans.reason @@ plainto_tsquery(?)", query)
end end

2
app/models/dmail.rb
View File

@@ -104,7 +104,7 @@ class Dmail < ActiveRecord::Base
def title_matches(query) def title_matches(query)
query = "*#{query}*" unless query =~ /\*/ query = "*#{query}*" unless query =~ /\*/
where("lower(dmails.title) LIKE ?", query.to_escaped_for_sql_like) where("lower(dmails.title) LIKE ?", query.mb_chars.downcase.to_escaped_for_sql_like)
end end
def search_message(query) def search_message(query)

3
test/unit/dmail_test.rb
View File

@@ -78,6 +78,9 @@ class DmailTest < ActiveSupport::TestCase
matches = Dmail.search(title_matches: "x") matches = Dmail.search(title_matches: "x")
assert_equal([dmail.id], matches.map(&:id)) assert_equal([dmail.id], matches.map(&:id))
matches = Dmail.search(title_matches: "X")
assert_equal([dmail.id], matches.map(&:id))
matches = Dmail.search(message_matches: "xxx") matches = Dmail.search(message_matches: "xxx")
assert_equal([dmail.id], matches.map(&:id)) assert_equal([dmail.id], matches.map(&:id))