lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent

Browse Source 
Fix psql search insensitive accent
This commit is contained in:
Laurent Destailleur 2019-02-08 09:29:59 +01:00 committed by GitHub
commit e5d7a862b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/db/pgsql.class.php
View File

@ -152,6 +152,7 @@ class DoliDBPgsql extends DoliDB
*/ */
static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false) static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
{ {
global $conf;
// Removed empty line if this is a comment line for SVN tagging // Removed empty line if this is a comment line for SVN tagging
if (preg_match('/^--\s\$Id/i',$line)) { if (preg_match('/^--\s\$Id/i',$line)) {
return ''; return '';
@ -311,7 +312,14 @@ class DoliDBPgsql extends DoliDB
} }
// To have postgresql case sensitive // To have postgresql case sensitive
$line=str_replace(' LIKE \'',' ILIKE \'',$line); $count_like=0;
$line=str_replace(' LIKE \'',' ILIKE \'',$line,$count_like);
if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0)
{
// @see https://docs.postgresql.fr/11/unaccent.html : 'unaccent()' function must be installed before
$line=preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
}
$line=str_replace(' LIKE BINARY \'',' LIKE \'',$line); $line=str_replace(' LIKE BINARY \'',' LIKE \'',$line);
// Replace INSERT IGNORE into INSERT // Replace INSERT IGNORE into INSERT