Merge pull request #48 from kijin/pr/utf8mb4

MySQL에서 utf8mb4 (이모티콘 등) 지원
This commit is contained in:
Kijin Sung 2016-01-12 10:53:31 +09:00
commit c10591e250
9 changed files with 139 additions and 731 deletions

View file

@ -178,7 +178,7 @@ class DB
*/
function create()
{
return new DB;
return new static();
}
/**

View file

@ -13,13 +13,13 @@
*/
class DBMysql extends DB
{
/**
* prefix of a tablename (One or more XEs can be installed in a single DB)
* @var string
*/
var $prefix = 'xe_'; // / <
var $comment_syntax = '/* %s */';
var $charset = 'utf8';
/**
* Column type used in MySQL
@ -49,15 +49,6 @@ class DBMysql extends DB
$this->_connect();
}
/**
* Create an instance of this class
* @return DBMysql return DBMysql object instance
*/
function create()
{
return new DBMysql;
}
/**
* DB Connect
* this method is private
@ -84,12 +75,18 @@ class DBMysql extends DB
$this->setError(mysql_errno(), mysql_error());
return;
}
// Error appears if the version is lower than 4.1
if(version_compare(mysql_get_server_info($result), '4.1', '<'))
{
$this->setError(-1, 'XE cannot be installed under the version of mysql 4.1. Current mysql version is ' . mysql_get_server_info());
return;
}
// Set charset
$this->charset = isset($connection["db_charset"]) ? $connection["db_charset"] : 'utf8';
mysql_set_charset($this->charset, $result);
// select db
@mysql_select_db($connection["db_database"], $result);
if(mysql_error())
@ -101,18 +98,6 @@ class DBMysql extends DB
return $result;
}
/**
* If have a task after connection, add a taks in this method
* this method is private
* @param resource $connection
* @return void
*/
function _afterConnect($connection)
{
// Set utf8 if a database is MySQL
$this->_query("set names 'utf8'", $connection);
}
/**
* DB disconnection
* this method is private
@ -186,7 +171,7 @@ class DBMysql extends DB
exit('XE cannot handle DB connection.');
}
// Run the query statement
$result = mysql_query($query, $connection);
$result = @mysql_query($query, $connection);
// Error Check
if(mysql_error($connection))
{
@ -570,17 +555,16 @@ class DBMysql extends DB
*/
function _createTable($xml_doc)
{
// xml parsing
// Parse XML
$oXml = new XmlParser();
$xml_obj = $oXml->parse($xml_doc);
// Create a table schema
// Get table name and column list
$table_name = $xml_obj->table->attrs->name;
if($this->isTableExists($table_name))
{
return;
}
$table_name = $this->prefix . $table_name;
if(!is_array($xml_obj->table->column))
{
$columns[] = $xml_obj->table->column;
@ -589,11 +573,14 @@ class DBMysql extends DB
{
$columns = $xml_obj->table->column;
}
// Initialize the list of columns and indexes
$column_schema = array();
$primary_list = array();
$unique_list = array();
$index_list = array();
// Process columns
foreach($columns as $column)
{
$name = $column->attrs->name;
@ -605,49 +592,96 @@ class DBMysql extends DB
$unique = $column->attrs->unique;
$default = $column->attrs->default;
$auto_increment = $column->attrs->auto_increment;
$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
$column_charset = '';
$index_size_limit = '';
// MySQL only supports 767 bytes for indexed columns.
// This is 191 characters in utf8mb4 and 255 characters in utf8.
if($column->attrs->utf8mb4 === 'false')
{
$column_charset = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci';
}
elseif(($primary_key || $unique || $index) && stripos($type, 'char') !== false)
{
if($size > 255 || ($size > 191 && $this->charset === 'utf8mb4'))
{
if($primary_key || $unique)
{
$size = ($this->charset === 'utf8mb4') ? 191 : 255;
}
else
{
$index_size_limit = '(' . (($this->charset === 'utf8mb4') ? 191 : 255) . ')';
}
}
}
$column_schema[$name] = sprintf('`%s` %s%s %s %s %s %s',
$name,
$this->column_type[$type],
$size ? "($size)" : '',
$column_charset,
isset($default) ? "DEFAULT '$default'" : '',
$notnull ? 'NOT NULL' : '',
$auto_increment ? 'AUTO_INCREMENT' : ''
);
if($primary_key)
{
$primary_list[] = $name;
$primary_list[] = "`$name`";
}
else if($unique)
{
$unique_list[$unique][] = $name;
$unique_list[$unique][] = "`$name`" . $index_size_limit;
}
else if($index)
{
$index_list[$index][] = $name;
$index_list[$index][] = "`$name`" . $index_size_limit;
}
}
// Process
// Process indexes
if(count($primary_list))
{
$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
$column_schema[] = sprintf("PRIMARY KEY (%s)", implode($primary_list, ', '));
}
if(count($unique_list))
{
foreach($unique_list as $key => $val)
{
$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
$column_schema[] = sprintf("UNIQUE %s (%s)", $key, implode($val, ', '));
}
}
if(count($index_list))
{
foreach($index_list as $key => $val)
{
$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
$column_schema[] = sprintf("INDEX %s (%s)", $key, implode($val, ', '));
}
}
$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci");
// Generate table schema
$engine = stripos(get_class($this), 'innodb') === false ? 'MYISAM' : 'INNODB';
$charset = $this->charset ?: 'utf8';
$collation = $charset . '_unicode_ci';
$schema = sprintf("CREATE TABLE `%s` (%s) %s",
$this->addQuotes($this->prefix . $table_name),
"\n" . implode($column_schema, ",\n") . "\n",
"ENGINE = $engine CHARACTER SET $charset COLLATE $collation"
);
// Execute the complete query
$output = $this->_query($schema);
if(!$output)
if($output)
{
return true;
}
else
{
return false;
}
}
/**
@ -788,7 +822,7 @@ class DBMysql extends DB
* @param boolean $force
* @return DBParser
*/
function &getParser($force = FALSE)
function getParser($force = FALSE)
{
$dbParser = new DBParser('`', '`', $this->prefix);
return $dbParser;
@ -967,6 +1001,30 @@ class DBMysql extends DB
return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
}
/**
* Find out the best supported character set
*
* @return string
*/
function getBestSupportedCharset()
{
if($output = $this->_fetch($this->_query("SHOW CHARACTER SET LIKE 'utf8%'")))
{
$mb4_support = false;
foreach($output as $row)
{
if($row->Charset === 'utf8mb4')
{
$mb4_support = true;
}
}
return $mb4_support ? 'utf8mb4' : 'utf8';
}
else
{
return 'utf8';
}
}
}
DBMysql::$isSupported = function_exists('mysql_connect');

View file

@ -15,37 +15,6 @@ require_once('DBMysql.class.php');
*/
class DBMysql_innodb extends DBMysql
{
/**
* Constructor
* @return void
*/
function __construct()
{
$this->_setDBInfo();
$this->_connect();
}
/**
* Create an instance of this class
* @return DBMysql_innodb return DBMysql_innodb object instance
*/
function create()
{
return new DBMysql_innodb;
}
/**
* DB disconnection
* this method is private
* @param resource $connection
* @return void
*/
function _close($connection)
{
@mysql_close($connection);
}
/**
* DB transaction start
* this method is private
@ -96,123 +65,9 @@ class DBMysql_innodb extends DBMysql
function _commit()
{
$connection = $this->_getConnection('master');
$this->_query("commit", $connection);
$this->_query("COMMIT", $connection);
return true;
}
/**
* Execute the query
* this method is private
* @param string $query
* @param resource $connection
* @return resource
*/
function __query($query, $connection)
{
if(!$connection)
{
exit('XE cannot handle DB connection.');
}
// Run the query statement
$result = @mysql_query($query, $connection);
// Error Check
if(mysql_error($connection))
{
$this->setError(mysql_errno($connection), mysql_error($connection));
}
// Return result
return $result;
}
/**
* Create table by using the schema xml
*
* type : number, varchar, tinytext, text, bigtext, char, date, \n
* opt : notnull, default, size\n
* index : primary key, index, unique\n
* @param string $xml_doc xml schema contents
* @return void|object
*/
function _createTable($xml_doc)
{
// xml parsing
$oXml = new XmlParser();
$xml_obj = $oXml->parse($xml_doc);
// Create a table schema
$table_name = $xml_obj->table->attrs->name;
if($this->isTableExists($table_name))
{
return;
}
$table_name = $this->prefix . $table_name;
if(!is_array($xml_obj->table->column))
{
$columns[] = $xml_obj->table->column;
}
else
{
$columns = $xml_obj->table->column;
}
foreach($columns as $column)
{
$name = $column->attrs->name;
$type = $column->attrs->type;
$size = $column->attrs->size;
$notnull = $column->attrs->notnull;
$primary_key = $column->attrs->primary_key;
$index = $column->attrs->index;
$unique = $column->attrs->unique;
$default = $column->attrs->default;
$auto_increment = $column->attrs->auto_increment;
$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
if($primary_key)
{
$primary_list[] = $name;
}
else if($unique)
{
$unique_list[$unique][] = $name;
}
else if($index)
{
$index_list[$index][] = $name;
}
}
if(count($primary_list))
{
$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
}
if(count($unique_list))
{
foreach($unique_list as $key => $val)
{
$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
}
}
if(count($index_list))
{
foreach($index_list as $key => $val)
{
$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
}
}
$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
$output = $this->_query($schema);
if(!$output)
{
return false;
}
}
}
DBMysql_innodb::$isSupported = function_exists('mysql_connect');

View file

@ -15,26 +15,6 @@ require_once('DBMysql.class.php');
*/
class DBMysqli extends DBMysql
{
/**
* Constructor
* @return void
*/
function __construct()
{
$this->_setDBInfo();
$this->_connect();
}
/**
* Create an instance of this class
* @return DBMysqli return DBMysqli object instance
*/
function create()
{
return new DBMysqli;
}
/**
* DB Connect
* this method is private
@ -65,7 +45,8 @@ class DBMysqli extends DBMysql
$this->setError($error, mysqli_connect_error());
return;
}
mysqli_set_charset($result, 'utf8');
$this->charset = isset($connection["db_charset"]) ? $connection["db_charset"] : 'utf8';
mysqli_set_charset($result, $this->charset);
return $result;
}

View file

@ -2,6 +2,7 @@
/* Copyright (C) NAVER <http://www.navercorp.com> */
require_once('DBMysql.class.php');
require_once('DBMysqli.class.php');
/**
* Class to use MySQLi innoDB DBMS as mysqli_*
@ -13,73 +14,8 @@ require_once('DBMysql.class.php');
* @package /classes/db
* @version 0.1
*/
class DBMysqli_innodb extends DBMysql
class DBMysqli_innodb extends DBMysqli
{
/**
* Constructor
* @return void
*/
function __construct()
{
$this->_setDBInfo();
$this->_connect();
}
/**
* Create an instance of this class
* @return DBMysqli_innodb return DBMysqli_innodb object instance
*/
function create()
{
return new DBMysqli_innodb;
}
/**
* DB Connect
* this method is private
* @param array $connection connection's value is db_hostname, db_port, db_database, db_userid, db_password
* @return resource
*/
function __connect($connection)
{
// Attempt to connect
if($connection["db_port"])
{
$result = @mysqli_connect($connection["db_hostname"]
, $connection["db_userid"]
, $connection["db_password"]
, $connection["db_database"]
, $connection["db_port"]);
}
else
{
$result = @mysqli_connect($connection["db_hostname"]
, $connection["db_userid"]
, $connection["db_password"]
, $connection["db_database"]);
}
$error = mysqli_connect_errno();
if($error)
{
$this->setError($error, mysqli_connect_error());
return;
}
mysqli_set_charset($result, 'utf8');
return $result;
}
/**
* DB disconnection
* this method is private
* @param resource $connection
* @return void
*/
function _close($connection)
{
mysqli_close($connection);
}
/**
* DB transaction start
* this method is private
@ -91,7 +27,15 @@ class DBMysqli_innodb extends DBMysql
if(!$transactionLevel)
{
$this->_query("begin");
if(function_exists('mysqli_begin_transaction'))
{
mysqli_begin_transaction($connection);
$this->setQueryLog(array('query' => 'START TRANSACTION'));
}
else
{
$this->_query("START TRANSACTION" . $point, $connection);
}
}
else
{
@ -108,7 +52,6 @@ class DBMysqli_innodb extends DBMysql
function _rollback($transactionLevel = 0)
{
$connection = $this->_getConnection('master');
$point = $transactionLevel - 1;
if($point)
@ -118,7 +61,7 @@ class DBMysqli_innodb extends DBMysql
else
{
mysqli_rollback($connection);
$this->setQueryLog( array("query"=>"rollback") );
$this->setQueryLog(array('query' => 'ROLLBACK'));
}
return true;
}
@ -132,449 +75,9 @@ class DBMysqli_innodb extends DBMysql
{
$connection = $this->_getConnection('master');
mysqli_commit($connection);
$this->setQueryLog( array("query"=>"commit") );
$this->setQueryLog(array('query' => 'COMMIT'));
return true;
}
/**
* Handles quatation of the string variables from the query
* @param string $string
* @return string
*/
function addQuotes($string)
{
if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
{
$string = stripslashes(str_replace("\\", "\\\\", $string));
}
if(!is_numeric($string))
{
$connection = $this->_getConnection('master');
$string = mysqli_escape_string($connection, $string);
}
return $string;
}
/**
* Execute the query
* this method is private
* @param string $query
* @param resource $connection
* @return resource
*/
function __query($query, $connection)
{
if($this->use_prepared_statements == 'Y')
{
// 1. Prepare query
$stmt = mysqli_prepare($connection, $query);
if($stmt)
{
$types = '';
$params = array();
$this->_prepareQueryParameters($types, $params);
if(!empty($params))
{
$args[0] = $stmt;
$args[1] = $types;
$i = 2;
foreach($params as $key => $param)
{
$copy[$key] = $param;
$args[$i++] = &$copy[$key];
}
// 2. Bind parameters
$status = call_user_func_array('mysqli_stmt_bind_param', $args);
if(!$status)
{
$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
}
}
// 3. Execute query
$status = mysqli_stmt_execute($stmt);
if(!$status)
{
$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
}
// Return stmt for other processing - like retrieving resultset (_fetch)
return $stmt;
// mysqli_stmt_close($stmt);
}
}
// Run the query statement
$result = mysqli_query($connection, $query);
// Error Check
$error = mysqli_error($connection);
if($error)
{
$this->setError(mysqli_errno($connection), $error);
}
// Return result
return $result;
}
/**
* Before execute query, prepare statement
* this method is private
* @param string $types
* @param array $params
* @return void
*/
function _prepareQueryParameters(&$types, &$params)
{
$types = '';
$params = array();
if(!$this->param)
{
return;
}
foreach($this->param as $k => $o)
{
$value = $o->getUnescapedValue();
$type = $o->getType();
// Skip column names -> this should be concatenated to query string
if($o->isColumnName())
{
continue;
}
switch($type)
{
case 'number' :
$type = 'i';
break;
case 'varchar' :
$type = 's';
break;
default:
$type = 's';
}
if(is_array($value))
{
foreach($value as $v)
{
$params[] = $v;
$types .= $type;
}
}
else
{
$params[] = $value;
$types .= $type;
}
}
}
/**
* Fetch the result
* @param resource $result
* @param int|NULL $arrayIndexEndValue
* @return array
*/
function _fetch($result, $arrayIndexEndValue = NULL)
{
if($this->use_prepared_statements != 'Y')
{
return parent::_fetch($result, $arrayIndexEndValue);
}
$output = array();
if(!$this->isConnected() || $this->isError() || !$result)
{
return $output;
}
// Prepared stements: bind result variable and fetch data
$stmt = $result;
$meta = mysqli_stmt_result_metadata($stmt);
$fields = mysqli_fetch_fields($meta);
/**
* Mysqli has a bug that causes LONGTEXT columns not to get loaded
* Unless store_result is called before
* MYSQLI_TYPE for longtext is 252
*/
$longtext_exists = false;
foreach($fields as $field)
{
if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
{
$field->name = 'repeat_' . $field->name;
}
// Array passed needs to contain references, not values
$row[$field->name] = "";
$resultArray[$field->name] = &$row[$field->name];
if($field->type == 252)
{
$longtext_exists = true;
}
}
$resultArray = array_merge(array($stmt), $resultArray);
if($longtext_exists)
{
mysqli_stmt_store_result($stmt);
}
call_user_func_array('mysqli_stmt_bind_result', $resultArray);
$rows = array();
while(mysqli_stmt_fetch($stmt))
{
$resultObject = new stdClass();
foreach($resultArray as $key => $value)
{
if($key === 0)
{
continue; // Skip stmt object
}
if(strpos($key, 'repeat_'))
{
$key = substr($key, 6);
}
$resultObject->$key = $value;
}
$rows[] = $resultObject;
}
mysqli_stmt_close($stmt);
if($arrayIndexEndValue)
{
foreach($rows as $row)
{
$output[$arrayIndexEndValue--] = $row;
}
}
else
{
$output = $rows;
}
if(count($output) == 1)
{
if(isset($arrayIndexEndValue))
{
return $output;
}
else
{
return $output[0];
}
}
return $output;
}
/**
* Handles insertAct
* @param Object $queryObject
* @param boolean $with_values
* @return resource
*/
function _executeInsertAct($queryObject, $with_values = false)
{
if($this->use_prepared_statements != 'Y')
{
return parent::_executeInsertAct($queryObject);
}
$this->param = $queryObject->getArguments();
$result = parent::_executeInsertAct($queryObject, $with_values);
unset($this->param);
return $result;
}
/**
* Handles updateAct
* @param Object $queryObject
* @param boolean $with_values
* @return resource
*/
function _executeUpdateAct($queryObject, $with_values = false)
{
if($this->use_prepared_statements != 'Y')
{
return parent::_executeUpdateAct($queryObject);
}
$this->param = $queryObject->getArguments();
$result = parent::_executeUpdateAct($queryObject, $with_values);
unset($this->param);
return $result;
}
/**
* Handles deleteAct
* @param Object $queryObject
* @param boolean $with_values
* @return resource
*/
function _executeDeleteAct($queryObject, $with_values = false)
{
if($this->use_prepared_statements != 'Y')
{
return parent::_executeDeleteAct($queryObject);
}
$this->param = $queryObject->getArguments();
$result = parent::_executeDeleteAct($queryObject, $with_values);
unset($this->param);
return $result;
}
/**
* Handle selectAct
* In order to get a list of pages easily when selecting \n
* it supports a method as navigation
* @param Object $queryObject
* @param resource $connection
* @param boolean $with_values
* @return Object
*/
function _executeSelectAct($queryObject, $connection = null, $with_values = false)
{
if($this->use_prepared_statements != 'Y')
{
return parent::_executeSelectAct($queryObject, $connection);
}
$this->param = $queryObject->getArguments();
$result = parent::_executeSelectAct($queryObject, $connection, $with_values);
unset($this->param);
return $result;
}
/**
* Get the ID generated in the last query
* Return next sequence from sequence table
* This method use only mysql
* @return int
*/
function db_insert_id()
{
$connection = $this->_getConnection('master');
return mysqli_insert_id($connection);
}
/**
* Fetch a result row as an object
* @param resource $result
* @return object
*/
function db_fetch_object(&$result)
{
return mysqli_fetch_object($result);
}
/**
* Free result memory
* @param resource $result
* @return boolean Returns TRUE on success or FALSE on failure.
*/
function db_free_result(&$result)
{
return mysqli_free_result($result);
}
/**
* Create table by using the schema xml
*
* type : number, varchar, tinytext, text, bigtext, char, date, \n
* opt : notnull, default, size\n
* index : primary key, index, unique\n
* @param string $xml_doc xml schema contents
* @return void|object
*/
function _createTable($xml_doc)
{
// xml parsing
$oXml = new XmlParser();
$xml_obj = $oXml->parse($xml_doc);
// Create a table schema
$table_name = $xml_obj->table->attrs->name;
if($this->isTableExists($table_name))
{
return;
}
$table_name = $this->prefix . $table_name;
if(!is_array($xml_obj->table->column))
{
$columns[] = $xml_obj->table->column;
}
else
{
$columns = $xml_obj->table->column;
}
foreach($columns as $column)
{
$name = $column->attrs->name;
$type = $column->attrs->type;
$size = $column->attrs->size;
$notnull = $column->attrs->notnull;
$primary_key = $column->attrs->primary_key;
$index = $column->attrs->index;
$unique = $column->attrs->unique;
$default = $column->attrs->default;
$auto_increment = $column->attrs->auto_increment;
$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
if($primary_key)
{
$primary_list[] = $name;
}
else if($unique)
{
$unique_list[$unique][] = $name;
}
else if($index)
{
$index_list[$index][] = $name;
}
}
if(count($primary_list))
{
$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
}
if(count($unique_list))
{
foreach($unique_list as $key => $val)
{
$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
}
}
if(count($index_list))
{
foreach($index_list as $key => $val)
{
$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
}
}
$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
$output = $this->_query($schema);
if(!$output)
{
return false;
}
}
}
DBMysqli_innodb::$isSupported = function_exists('mysqli_connect');