upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #28677 from nextcloud/fix/noid/mysql-collation

Browse source 
make it possible to  override the default collation on mysql
This commit is contained in:
blizzz 2021-09-09 19:39:30 +02:00 committed by GitHub
commit 5c1b40ec36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
config/config.sample.php
View file

@ -1558,6 +1558,24 @@ $CONFIG = [
*/
'mysql.utf8mb4' => false,
/**
* For search queries in the database, a default collation – depending on the
* character set – is chosen. In some cases a different behaviour is desired,
* for instances when a accent sensitive search is desired.
*
* MariaDB and MySQL have an overlap in available collations, but also
* incompatible ones, also depending on the version of the database server.
*
* This option allows to override the automatic choice. Example:
*
* 'mysql.collation' => 'utf8mb4_0900_as_ci',
*
* This setting has no effect on setup or creating tables. In those cases
* always utf8[mb4]_bin is being used. This setting is only taken into
* consideration in SQL queries that utilize LIKE comparison operators.
*/
'mysql.collation' => null,
/**
* Database types that are supported for installation.
*

12
lib/private/DB/AdapterMySQL.php
View file

@ -25,7 +25,7 @@ namespace OC\DB;
class AdapterMySQL extends Adapter {
/** @var string */
protected $charset;
protected $collation;
/**
* @param string $tableName
@ -39,16 +39,16 @@ class AdapterMySQL extends Adapter {
}
public function fixupStatement($statement) {
$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCollation() . ' LIKE ', $statement);
return $statement;
}
protected function getCharset() {
if (!$this->charset) {
protected function getCollation(): string {
if (!$this->collation) {
$params = $this->conn->getParams();
$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8') . '_general_ci');
}
return $this->charset;
return $this->collation;
}
}

4
lib/private/DB/ConnectionFactory.php
View file

@ -89,6 +89,10 @@ class ConnectionFactory {
if ($this->config->getValue('mysql.utf8mb4', false)) {
$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
}
$collationOverride = $this->config->getValue('mysql.collation', null);
if ($collationOverride) {
$this->defaultConnectionParams['mysql']['collation'] = $collationOverride;
}
}
/**

6
lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
View file

@ -31,7 +31,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
class MySqlExpressionBuilder extends ExpressionBuilder {
/** @var string */
protected $charset;
protected $collation;
/**
* @param ConnectionAdapter $connection
@ -41,7 +41,7 @@ class MySqlExpressionBuilder extends ExpressionBuilder {
parent::__construct($connection, $queryBuilder);
$params = $connection->getInner()->getParams();
$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8') . '_general_ci');
}
/**
@ -50,6 +50,6 @@ class MySqlExpressionBuilder extends ExpressionBuilder {
public function iLike($x, $y, $type = null): string {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->collation . ' LIKE', $y);
}
}