diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-10-18 11:37:49 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-10-19 00:15:01 +0200 |
| commit | 64c9ef96c4a8b205e32cdc1a38038aef18dcf4cf (patch) | |
| tree | 03c1fdf534c59644c71e18b2e4c7d6a72901be9f /lib/private/DB/AdapterMySQL.php | |
| parent | 17a2723948830e30713d012f0739c336af2a12f1 (diff) | |
| download | nextcloud-server-64c9ef96c4a8b205e32cdc1a38038aef18dcf4cf.tar.gz nextcloud-server-64c9ef96c4a8b205e32cdc1a38038aef18dcf4cf.zip | |
Fix like queries in the QueryBuilder
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/DB/AdapterMySQL.php')
| -rw-r--r-- | lib/private/DB/AdapterMySQL.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index 0c0c6b31021..aa784bb83dc 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -27,6 +27,9 @@ namespace OC\DB; class AdapterMySQL extends Adapter { + /** @var string */ + protected $charset; + /** * @param string $tableName */ @@ -39,8 +42,16 @@ class AdapterMySQL extends Adapter { } public function fixupStatement($statement) { - $characterSet = \OC::$server->getConfig()->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8'; - $statement = str_replace(' ILIKE ', ' COLLATE ' . $characterSet . '_general_ci LIKE ', $statement); + $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement); return $statement; } + + protected function getCharset() { + if (!$this->charset) { + $params = $this->conn->getParams(); + $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8'; + } + + return $this->charset; + } } |