summaryrefslogtreecommitdiff
path: root/lib/gitlab/sql
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-02-15 19:55:43 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2018-02-22 18:55:36 +0100
commit090eeb581b3809ab83d52f7baa2bcfbd63b1c2ba (patch)
tree83241b53bdd4ea705611e60ab1ab39f5079ec8c9 /lib/gitlab/sql
parent41bfe82b7a650f21b19a25204dde5a0eaf960d0f (diff)
downloadgitlab-ce-090eeb581b3809ab83d52f7baa2bcfbd63b1c2ba.tar.gz
Added changelog for user search improvementsusers-autocomplete
Diffstat (limited to 'lib/gitlab/sql')
-rw-r--r--lib/gitlab/sql/pattern.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/sql/pattern.rb b/lib/gitlab/sql/pattern.rb
index 0e3a93aa236..53744bad1f4 100644
--- a/lib/gitlab/sql/pattern.rb
+++ b/lib/gitlab/sql/pattern.rb
@@ -38,16 +38,14 @@ module Gitlab
if words.any?
words.map { |word| arel_table[column].matches(to_pattern(word)) }.reduce(:and)
else
- sanitized_query = sanitize_sql_like(query)
-
# No words of at least 3 chars, but we can search for an exact
# case insensitive match with the query as a whole
if lower_exact_match
Arel::Nodes::NamedFunction
.new('LOWER', [arel_table[column]])
- .eq(sanitized_query)
+ .eq(query)
else
- arel_table[column].matches(sanitized_query)
+ arel_table[column].matches(sanitize_sql_like(query))
end
end
end