Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Apply charset and collation only if they are specified

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2017-05-30 21:05:01 +03:00
parent 33d6533c64
commit c56b56f4aa
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Config/Database.php
View File

@ -32,8 +32,16 @@ class Database {
$driver_options = array( $driver_options = array(
'TIME_ZONE = "' . Env::$db_timezone_offset . '"', 'TIME_ZONE = "' . Env::$db_timezone_offset . '"',
'sql_mode=(SELECT REPLACE(@@sql_mode,"ONLY_FULL_GROUP_BY",""))', 'sql_mode=(SELECT REPLACE(@@sql_mode,"ONLY_FULL_GROUP_BY",""))',
'NAMES ' . Env::$db_charset . ' COLLATE ' . ENV::$db_collation,
); );
if(!empty(Env::$db_charset)) {
$character_set = 'NAMES ' . Env::$db_charset;
if(!empty(Env::$db_collation)) {
$character_set .= ' COLLATE ' . Env::$db_collation;
}
$driver_options[] = $character_set;
}
$current_options = ORM::for_table("") $current_options = ORM::for_table("")
->raw_query('SELECT @@session.wait_timeout as wait_timeout') ->raw_query('SELECT @@session.wait_timeout as wait_timeout')
->findOne(); ->findOne();

7
lib/Config/Env.php
View File

@ -67,11 +67,11 @@ class Env {
self::$db_charset = $wpdb->charset; self::$db_charset = $wpdb->charset;
self::$db_collation = $wpdb->collate; self::$db_collation = $wpdb->collate;
self::$db_charset_collate = $wpdb->get_charset_collate(); self::$db_charset_collate = $wpdb->get_charset_collate();
self::$db_source_name = self::dbSourceName(self::$db_host, self::$db_socket, self::$db_port); self::$db_source_name = self::dbSourceName(self::$db_host, self::$db_socket, self::$db_port, self::$db_charset);
self::$db_timezone_offset = self::getDbTimezoneOffset(); self::$db_timezone_offset = self::getDbTimezoneOffset();
} }
private static function dbSourceName($host, $socket, $port) { private static function dbSourceName($host, $socket, $port, $charset) {
$source_name = array( $source_name = array(
(!$socket) ? 'mysql:host=' : 'mysql:unix_socket=', (!$socket) ? 'mysql:host=' : 'mysql:unix_socket=',
$host, $host,
@ -82,6 +82,9 @@ class Env {
'dbname=', 'dbname=',
DB_NAME DB_NAME
); );
if(!empty($charset)) {
$source_name[] = ';charset=' . $charset;
}
return implode('', $source_name); return implode('', $source_name);
} }