gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless array_merge()

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-12-04 15:25:56 +01:00
parent d769f77891
commit 56a3d8f828
1 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/Table/ColumnsDefinition.php
View File

@ -157,55 +157,20 @@ final class ColumnsDefinition
$extractedColumnSpec = [];
if ($regenerate) {
$columnMeta = array_merge(
$columnMeta,
[
'Field' => Util::getValueByKey(
$_POST,
'field_name.' . $columnNumber,
),
'Type' => Util::getValueByKey(
$_POST,
'field_type.' . $columnNumber,
),
'Collation' => Util::getValueByKey(
$_POST,
'field_collation.' . $columnNumber,
'',
),
'Null' => Util::getValueByKey(
$_POST,
'field_null.' . $columnNumber,
'',
),
'DefaultType' => Util::getValueByKey(
$_POST,
'field_default_type.' . $columnNumber,
'NONE',
),
'DefaultValue' => Util::getValueByKey(
$_POST,
'field_default_value.' . $columnNumber,
'',
),
'Extra' => Util::getValueByKey(
$_POST,
'field_extra.' . $columnNumber,
),
'Virtuality' => Util::getValueByKey(
$_POST,
'field_virtuality.' . $columnNumber,
'',
),
'Expression' => Util::getValueByKey(
$_POST,
'field_expression.' . $columnNumber,
'',
),
],
);
$columnMeta = [
'Field' => Util::getValueByKey($_POST, 'field_name.' . $columnNumber),
'Type' => Util::getValueByKey($_POST, 'field_type.' . $columnNumber),
'Collation' => Util::getValueByKey($_POST, 'field_collation.' . $columnNumber, ''),
'Null' => Util::getValueByKey($_POST, 'field_null.' . $columnNumber, ''),
'DefaultType' => Util::getValueByKey($_POST, 'field_default_type.' . $columnNumber, 'NONE'),
'DefaultValue' => Util::getValueByKey($_POST, 'field_default_value.' . $columnNumber, ''),
'Extra' => Util::getValueByKey($_POST, 'field_extra.' . $columnNumber),
'Virtuality' => Util::getValueByKey($_POST, 'field_virtuality.' . $columnNumber, ''),
'Expression' => Util::getValueByKey($_POST, 'field_expression.' . $columnNumber, ''),
'Key' => '',
'Comment' => false,
];
$columnMeta['Key'] = '';
$parts = explode(
'_',
Util::getValueByKey($_POST, 'field_key.' . $columnNumber, ''),
@ -222,8 +187,6 @@ final class ColumnsDefinition
};
}
$columnMeta['Comment'] = false;
switch ($columnMeta['DefaultType']) {
case 'NONE':
$columnMeta['Default'] = null;