Skip to content

Commit 51f53c3

Browse files
author
杨利兵
committed
MySql DDL添加注释,生成失败时Exit(1);
1 parent 7622388 commit 51f53c3

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/cg.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public class cg {
2020

2121
public static void main(String[] args) {
2222
CodeGenShell shell = new CodeGenShell();
23-
shell.invoke(args);
23+
boolean r = shell.invoke(args);
24+
if (!r) {
25+
System.exit(1);
26+
}
2427
}
2528
}

src/com/yanglb/utilitys/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,23 @@ private String genDdlDetail(DdlDetail detail) {
246246
if (colType.contains("text") || colType.contains("char")) {
247247
sb.append(String.format(" DEFAULT '%s'", detail.getColDefault()));
248248
} else {
249-
sb.append(String.format(" DEFAULT %s", detail.getColDefault()));
249+
String def = detail.getColDefault();
250+
if (!StringUtility.isNullOrEmpty(def) && def.toUpperCase().startsWith("ON ")) {
251+
sb.append(" " + detail.getColDefault());
252+
} else {
253+
sb.append(String.format(" DEFAULT %s", detail.getColDefault()));
254+
}
250255
}
251256
}
257+
258+
// 注释
259+
if (!StringUtility.isNullOrEmpty(detail.getFieldName())) {
260+
String name = detail.getFieldName();
261+
name.replaceAll("'", "");
262+
name.replaceAll("\r", "");
263+
name.replaceAll("\n", "");
264+
sb.append(String.format(" COMMENT '%s'", name));
265+
}
252266

253267
sb.append(",\r\n");
254268
return sb.toString();

src/com/yanglb/utilitys/codegen/shell/CodeGenShell.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public boolean invoke(String[] args) {
8181
* 显示帮助信息
8282
*/
8383
private void showHelp() {
84-
System.out.println("代码生成器 v2.0.1 使用说明");
85-
System.out.println("Copyright 2015-2016 yanglb.com All Rights Reserved.");
84+
System.out.println("代码生成器 v2.0.2 使用说明");
85+
System.out.println("Copyright 2015-2019 yanglb.com All Rights Reserved.");
8686
System.out.println();
8787
System.out.println("用法:");
8888
System.out.println("cg -type 生成类型 -lang 生成语言 -in 输入文件 [-sheets 要生成的Sheet名1[,2]] [-out 输出目录]");

0 commit comments

Comments
 (0)