mirrors/buildadmin
1
0
Fork 0
mirror of https://gitee.com/wonderful-code/buildadmin synced 2024-11-22 07:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(CRUD):修复为varchar等字段类型设置无符号属性时报错的问题

Browse Source
This commit is contained in:
妙码生花 2022-11-23 02:19:53 +08:00
parent d5bc346170
commit 522a70db80
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/admin/library/crud/Helper.php
View File

@ -246,14 +246,17 @@ class Helper
public static function createTable($name, $comment, $fields): array
{
$fieldType = [
'variableLength' => ['blob', 'date', 'enum', 'geometry', 'geometrycollection', 'json', 'linestring', 'longblob', 'longtext', 'mediumblob', 'mediumtext', 'multilinestring', 'multipoint', 'multipolygon', 'point', 'polygon', 'set', 'text', 'tinyblob', 'tinytext', 'year'],
'fixedLength' => ['int', 'bigint', 'binary', 'bit', 'char', 'datetime', 'mediumint', 'smallint', 'time', 'timestamp', 'tinyint', 'varbinary', 'varchar'],
'decimal' => ['decimal', 'double', 'float'],
'variableLength' => ['blob', 'date', 'enum', 'geometry', 'geometrycollection', 'json', 'linestring', 'longblob', 'longtext', 'mediumblob', 'mediumtext', 'multilinestring', 'multipoint', 'multipolygon', 'point', 'polygon', 'set', 'text', 'tinyblob', 'tinytext', 'year'],
'fixedLength' => ['int', 'bigint', 'binary', 'bit', 'char', 'datetime', 'mediumint', 'smallint', 'time', 'timestamp', 'tinyint', 'varbinary', 'varchar'],
'decimal' => ['decimal', 'double', 'float'],
'supportUnsigned' => ['int', 'tinyint', 'smallint', 'mediumint', 'integer', 'bigint', 'real', 'double', 'float', 'decimal', 'numeric'],
];
$name = self::getTableName($name);
$sql = "CREATE TABLE IF NOT EXISTS `$name` (" . PHP_EOL;
$pk = '';
foreach ($fields as $field) {
$fieldConciseType = self::analyseFieldType($field);
// 组装dateType
if (!isset($field['dataType']) || !$field['dataType']) {
if (!$field['type']) {
continue;
@ -268,7 +271,7 @@ class Helper
$field['dataType'] = $field['precision'] ? "{$field['type']}({$field['length']},{$field['precision']})" : "{$field['type']}({$field['length']})";
}
}
$unsigned = $field['unsigned'] ? ' UNSIGNED' : '';
$unsigned = ($field['unsigned'] && in_array($fieldConciseType, $fieldType['supportUnsigned'])) ? ' UNSIGNED' : '';
$null = $field['null'] ? ' NULL' : ' NOT NULL';
$autoIncrement = $field['autoIncrement'] ? ' AUTO_INCREMENT' : '';
$default = '';
@ -535,16 +538,22 @@ class Helper
}
}
public static function analyseFieldType($field): string
{
$dataType = (isset($field['dataType']) && $field['dataType']) ? $field['dataType'] : $field['type'];
if (stripos($dataType, '(') !== false) {
$typeName = explode('(', $field['dataType']);
return trim($typeName[0]);
}
return trim($field['type']);
}
/**
* 分析字段
*/
public static function analyseField(&$field)
{
$field['dataType'] = (isset($field['dataType']) && $field['dataType']) ? $field['dataType'] : $field['type'];
if (stripos($field['dataType'], '(') !== false) {
$typeName = explode('(', $field['dataType']);
$field['type'] = trim($typeName[0]);
}
$field['type'] = self::analyseFieldType($field);
// 表单项类型转换对照表
$designTypeComparison = [