BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c84e19e14eb2204afaecd1d50716c73a8189b4e6

Authored by 芋道源码
Committed by Gitee
2 parents b369b363 2fc1ef51

!55 修复基于建表SQL生成代码 列名没有COMMENT注释报错的问题 

Merge pull request !55 from 夜丶点缀了一个人的落寞/hotfix-tool-codegen
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
  View file @c84e19e
@@ -16,6 +16,7 @@ import org.apache.commons.collections4.keyvalue.DefaultKeyValue; @@ -16,6 +16,7 @@ import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
16 16
17 import java.util.ArrayList; 17 import java.util.ArrayList;
18 import java.util.List; 18 import java.util.List;
  19 +import java.util.Objects;
19 20
20 import static com.alibaba.druid.sql.SQLUtils.normalize; 21 import static com.alibaba.druid.sql.SQLUtils.normalize;
21 22
@@ -97,7 +98,8 @@ public class ToolCodegenSQLParser { @@ -97,7 +98,8 @@ public class ToolCodegenSQLParser {
97 columns.add(ToolSchemaColumnDO.builder() 98 columns.add(ToolSchemaColumnDO.builder()
98 .columnName(normalize(definition.getColumnName())) 99 .columnName(normalize(definition.getColumnName()))
99 .columnType(definition.getDataType().toString()) 100 .columnType(definition.getDataType().toString())
100 - .columnComment(normalize(definition.getComment().toString())) 101 + .columnComment(Objects.isNull(definition.getComment()) ? ""
  102 + : normalize(definition.getComment().toString()))
101 .nullable(!text.contains(" NOT NULL")) 103 .nullable(!text.contains(" NOT NULL"))
102 .primaryKey(false) 104 .primaryKey(false)
103 .autoIncrement(text.contains("AUTO_INCREMENT")) 105 .autoIncrement(text.contains("AUTO_INCREMENT"))