summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-02-08 15:13:57 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-02-08 15:13:57 +0000
commitaf5872b7d432f78befcb7e9f87187a5b82b588bf (patch)
treecb8420064142f4c3a3d95b2f9ad5ca21232cbf3b /lib
parentaeb6dbc306163548a78d320d291b45b17b2ecf7f (diff)
downloadredmine-af5872b7d432f78befcb7e9f87187a5b82b588bf.tar.gz
redmine-af5872b7d432f78befcb7e9f87187a5b82b588bf.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb9
-rw-r--r--lib/redmine/database.rb53
2 files changed, 59 insertions, 3 deletions
diff --git a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index e490c8fa7..96d1c2588 100644
--- a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -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
diff --git a/lib/redmine/database.rb b/lib/redmine/database.rb
new file mode 100644
index 000000000..290c78ea4
--- /dev/null
+++ b/lib/redmine/database.rb
@@ -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