fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Return more information from DB::getColumnInfo() and DB::getIndexInfo()

Browse source
This commit is contained in:
Kijin Sung 2025-12-17 16:43:18 +09:00
parent a9045b956d
commit f3ff338711
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/framework/DB.php
View file

@ -962,7 +962,7 @@ class DB
public function getColumnInfo(string $table_name, string $column_name): ?object public function getColumnInfo(string $table_name, string $column_name): ?object
{ {
// If column information is not found, return null. // If column information is not found, return null.
$stmt = $this->_handle->query(sprintf("SHOW FIELDS FROM `%s` WHERE Field = '%s'", $this->addQuotes($this->_prefix . $table_name), $this->addQuotes($column_name))); $stmt = $this->_handle->query(sprintf("SHOW FULL COLUMNS FROM `%s` WHERE Field = '%s'", $this->addQuotes($this->_prefix . $table_name), $this->addQuotes($column_name)));
$column_info = $this->fetch($stmt); $column_info = $this->fetch($stmt);
if (!$column_info) if (!$column_info)
{ {
@ -982,6 +982,16 @@ class DB
} }
$xetype = Parsers\DBTableParser::getXEType($dbtype, $size ?: ''); $xetype = Parsers\DBTableParser::getXEType($dbtype, $size ?: '');
// Detect the character set.
if (preg_match('/^([a-zA-Z0-9]+)/', $column_info->{'Collation'} ?? '', $matches))
{
$charset = $matches[1] === 'utf8mb3' ? 'utf8' : $matches[1];
}
else
{
$charset = null;
}
// Return the result as an object. // Return the result as an object.
return (object)array( return (object)array(
'name' => $column_name, 'name' => $column_name,
@ -990,6 +1000,8 @@ class DB
'size' => $size, 'size' => $size,
'default_value' => $column_info->{'Default'}, 'default_value' => $column_info->{'Default'},
'notnull' => strncmp($column_info->{'Null'}, 'NO', 2) == 0 ? true : false, 'notnull' => strncmp($column_info->{'Null'}, 'NO', 2) == 0 ? true : false,
'charset' => $charset,
'collation' => $column_info->{'Collation'} ?: null,
); );
} }
@ -1100,6 +1112,7 @@ class DB
return (object)array( return (object)array(
'name' => $column->Key_name, 'name' => $column->Key_name,
'table' => $column->Table, 'table' => $column->Table,
'type' => $column->Index_type,
'is_unique' => $is_unique, 'is_unique' => $is_unique,
'columns' => $columns, 'columns' => $columns,
); );