fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Allow setting new charset in DB::modifyColumn()

Browse source
This commit is contained in:
Kijin Sung 2021-12-13 15:20:58 +09:00
parent 0710285582
commit 74eeaf3459
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/framework/db.php
View file

@ -841,9 +841,10 @@ class DB
* @param bool $notnull
* @param string $after_column
* @param string $new_name
* @param string $new_charset
* @return BaseObject
*/
public function modifyColumn(string $table_name, string $column_name, string $type = 'number', $size = null, $default = null, $notnull = false, $after_column = null, $new_name = null): \BaseObject
public function modifyColumn(string $table_name, string $column_name, string $type = 'number', $size = null, $default = null, $notnull = false, $after_column = null, $new_name = null, $new_charset = null): \BaseObject
{
// Normalize the type and size.
list($type, $xetype, $size) = Parsers\DBTableParser::getTypeAndSize($type, strval($size));
@ -858,6 +859,15 @@ class DB
$query = sprintf("ALTER TABLE `%s` MODIFY `%s` ", $this->addQuotes($this->_prefix . $table_name), $this->addQuotes($column_name));
}
$query .= $size ? sprintf('%s(%s)', $type, $size) : $type;
// Add the character set information.
if (isset($new_charset))
{
$new_collation = preg_match('/^utf8/i', $new_charset) ? ($new_charset . '_unicode_ci') : ($new_charset . '_general_ci');
$query .= ' CHARACTER SET ' . $new_charset . ' COLLATE ' . $new_collation;
}
// Add the NOT NULL constraint.
$query .= $notnull ? ' NOT NULL' : '';
// Add the default value according to the type.