Commit 2fc1ef519dfd4ef3c9f6208258882ad50ec1faf3
1 parent
b369b363
修复基于建表SQL生成代码 列名没有COMMENT注释报错的问题
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
| ... | ... | @@ -16,6 +16,7 @@ import org.apache.commons.collections4.keyvalue.DefaultKeyValue; |
| 16 | 16 | |
| 17 | 17 | import java.util.ArrayList; |
| 18 | 18 | import java.util.List; |
| 19 | +import java.util.Objects; | |
| 19 | 20 | |
| 20 | 21 | import static com.alibaba.druid.sql.SQLUtils.normalize; |
| 21 | 22 | |
| ... | ... | @@ -97,7 +98,8 @@ public class ToolCodegenSQLParser { |
| 97 | 98 | columns.add(ToolSchemaColumnDO.builder() |
| 98 | 99 | .columnName(normalize(definition.getColumnName())) |
| 99 | 100 | .columnType(definition.getDataType().toString()) |
| 100 | - .columnComment(normalize(definition.getComment().toString())) | |
| 101 | + .columnComment(Objects.isNull(definition.getComment()) ? "" | |
| 102 | + : normalize(definition.getComment().toString())) | |
| 101 | 103 | .nullable(!text.contains(" NOT NULL")) |
| 102 | 104 | .primaryKey(false) |
| 103 | 105 | .autoIncrement(text.contains("AUTO_INCREMENT")) | ... | ... |