|
@@ -147,17 +147,18 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
String primaryKey = null;
|
|
|
//拼接建表语句
|
|
|
StringBuffer sb = new StringBuffer("create table if not exists ");
|
|
|
- sb.append(tableName).append(" (\r\n");
|
|
|
+ String trimName = StringUtils.trim(tableName);
|
|
|
+ sb.append(trimName).append(" (\r\n");
|
|
|
for (GenTableColumn genTableColumn : genTableColumns) {
|
|
|
if (!"HR".equals(genTableColumn.getHtmlType())){
|
|
|
- sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
|
|
|
+ sb.append("`").append(StringUtils.trim(genTableColumn.getColumnName())).append("` ").append(StringUtils.trim(genTableColumn.getColumnType()));
|
|
|
if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
|
|
|
primaryKey = genTableColumn.getColumnName();
|
|
|
sb.append(" NOT NULL COMMENT '");
|
|
|
}else {
|
|
|
- sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
|
|
|
+ sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(StringUtils.trim(genTableColumn.getDefaultValue())).append("' COMMENT '");
|
|
|
}
|
|
|
- sb.append(genTableColumn.getColumnComment()).append("'").append(",").append("\r\n");
|
|
|
+ sb.append(StringUtils.trim(genTableColumn.getColumnComment())).append("'").append(",").append("\r\n");
|
|
|
}
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(primaryKey)) {
|
|
@@ -165,7 +166,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
}else {
|
|
|
sb.replace(sb.lastIndexOf(","),sb.length(),"\r\n");
|
|
|
}
|
|
|
- sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='").append(tableName).append("';");
|
|
|
+ sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='").append(trimName).append("';");
|
|
|
return sb.toString();
|
|
|
}
|
|
|
|