mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-28 03:11:15 +00:00
Support for accent insensitive search with PostgreSQL (#18801).
If the unaccent extension is installed, the search engine will use it in order to do accent insensitive search. git-svn-id: http://svn.redmine.org/redmine/trunk@13989 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
aeb6dbc306
commit
af5872b7d4
@ -159,9 +159,12 @@ module Redmine
|
||||
private :search_tokens_condition
|
||||
|
||||
def search_token_match_statement(column, value='?')
|
||||
case connection.adapter_name
|
||||
when /postgresql/i
|
||||
"#{column} ILIKE #{value}"
|
||||
if Redmine::Database.postgresql?
|
||||
if Redmine::Database.postgresql_unaccent?
|
||||
"unaccent(#{column}) ILIKE unaccent(#{value})"
|
||||
else
|
||||
"#{column} ILIKE #{value}"
|
||||
end
|
||||
else
|
||||
"#{column} LIKE #{value}"
|
||||
end
|
||||
|
||||
53
lib/redmine/database.rb
Normal file
53
lib/redmine/database.rb
Normal file
@ -0,0 +1,53 @@
|
||||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2015 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
module Redmine
|
||||
# Helper module to get information about the Redmine database
|
||||
module Database
|
||||
class << self
|
||||
# Returns true if the database is PostgreSQL
|
||||
def postgresql?
|
||||
(ActiveRecord::Base.connection.adapter_name =~ /postgresql/i).present?
|
||||
end
|
||||
|
||||
# Returns the PostgreSQL version or nil if another DBMS is used
|
||||
def postgresql_version
|
||||
postgresql? ? ActiveRecord::Base.connection.send(:postgresql_version) : nil
|
||||
end
|
||||
|
||||
# Returns true if the database is a PostgreSQL >=9.0 database with the unaccent extension installed
|
||||
def postgresql_unaccent?
|
||||
if postgresql?
|
||||
return @postgresql_unaccent unless @postgresql_unaccent.nil?
|
||||
begin
|
||||
sql = "SELECT name FROM pg_available_extensions WHERE installed_version IS NOT NULL and name = 'unaccent'"
|
||||
@postgresql_unaccent = postgresql_version >= 90000 && ActiveRecord::Base.connection.select_value(sql).present?
|
||||
rescue
|
||||
false
|
||||
end
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
# Resets database information
|
||||
def reset
|
||||
@postgresql_unaccent = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -169,6 +169,10 @@ class ActiveSupport::TestCase
|
||||
ActiveRecord::Base.connection.adapter_name =~ /mysql/i
|
||||
end
|
||||
|
||||
def postgresql?
|
||||
ActiveRecord::Base.connection.adapter_name =~ /postgresql/i
|
||||
end
|
||||
|
||||
def assert_save(object)
|
||||
saved = object.save
|
||||
message = "#{object.class} could not be saved"
|
||||
|
||||
@ -171,6 +171,25 @@ class SearchTest < ActiveSupport::TestCase
|
||||
end
|
||||
end
|
||||
|
||||
def test_search_should_be_case_and_accent_insensitive_with_postgresql_and_noaccent_extension
|
||||
if postgresql?
|
||||
skip unless Redmine::Database.postgresql_version >= 90000
|
||||
# Extension will be rollbacked with the test transaction
|
||||
ActiveRecord::Base.connection.execute("CREATE EXTENSION IF NOT EXISTS unaccent")
|
||||
Redmine::Database.reset
|
||||
assert Redmine::Database.postgresql_unaccent?
|
||||
|
||||
issue1 = Issue.generate!(:subject => "OO")
|
||||
issue2 = Issue.generate!(:subject => "oo")
|
||||
|
||||
r = Issue.search_results('ÖÖ')
|
||||
assert_include issue1, r
|
||||
assert_include issue2, r
|
||||
end
|
||||
ensure
|
||||
Redmine::Database.reset
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def remove_permission(role, permission)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user