holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix SQL error for MariaDB 10.3 on inserting 4-byte utf-8 chars

Browse Source 
enabling the replacement now uncoditional for MySQL/MariaDB
This commit is contained in:
Ralf Becker 2019-01-14 12:07:55 +01:00
parent ada528bff6
commit bad2c9e571
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Db.php
View File

@ -1492,10 +1492,11 @@ class Db
// for boolean types, causing it to return "true" or "false" and not a quoted string like "'1'"!
if (is_bool($value)) $value = (string)$value;
// MySQL and MariaDB before 10.1 need 4-byte utf8 chars replaced with our default utf8 charset
// MySQL and MariaDB not 10.1 need 4-byte utf8 chars replaced with our default utf8 charset
// (MariaDB 10.1 does the replacement automatic, 10.0 cuts everything off behind and MySQL gives an error)
// (MariaDB 10.3 gives an error too: Incorrect string value: '\xF0\x9F\x98\x8A\x0AW...')
// Changing charset to utf8mb4 requires schema update, shortening of some indexes and probably have negative impact on performace!
if (substr($this->Type, 0, 5) == 'mysql' && $this->ServerInfo['version'] < 10.1)
if (substr($this->Type, 0, 5) == 'mysql')
{
$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
}