添加MySql配置

Author: 杨利兵

src/main/java/com/yanglb/codegen/core/parser/impl/DdlMySqlParser.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2015-2020 yanglb.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yanglb.codegen.core.parser.impl;
+
+import com.yanglb.codegen.utils.Conf;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+public class DdlMySqlParser extends DdlParser {
+    @Override
+    protected Options options() {
+        Options options = super.options();
+
+        Option engine = Option.builder()
+                .longOpt("engine")
+                .hasArg()
+                .desc(String.format("指定MySql Engine，默认为 %s 。", Conf.getSetting("mysql.engine")))
+                .build();
+        options.addOption(engine);
+
+        Option charset = Option.builder()
+                .longOpt("charset")
+                .hasArg()
+                .desc(String.format("指定MySql Default Charset，默认为 %s 。", Conf.getSetting("mysql.charset")))
+                .build();
+        options.addOption(charset);
+
+        return options;
+    }
+}

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

@@ -26,6 +26,7 @@
 import com.yanglb.codegen.model.ForeignModel;
 import com.yanglb.codegen.core.translator.BaseDdlTranslator;
 import com.yanglb.codegen.exceptions.CodeGenException;
+import com.yanglb.codegen.utils.Conf;
 import com.yanglb.codegen.utils.Infos;
 import com.yanglb.codegen.utils.StringUtil;
 
@@ -148,8 +149,8 @@ public String genDdl(DdlModel model) throws CodeGenException {
 
 		// 引擎、字符集等其它信息
 		StringBuilder info = new StringBuilder();
-		info.append("ENGINE={my_sql_engine} ");
-		info.append("DEFAULT CHARSET={my_sql_defaultCharSet} ");
+		info.append(String.format("ENGINE=%s ", engine()));
+		info.append(String.format("DEFAULT CHARSET=%s ", charset()));
 		if (autoIncrement != null) {
 			info.append(String.format("AUTO_INCREMENT=%d ", autoIncrement));
 		}
@@ -162,6 +163,13 @@ public String genDdl(DdlModel model) throws CodeGenException {
 
 		return sb.toString();
 	}
+
+	private String engine() {
+		return paramaModel.getOptions().getOptionValue("engine", Conf.getSetting("mysql.engine"));
+	}
+	private String charset() {
+		return paramaModel.getOptions().getOptionValue("charset", Conf.getSetting("mysql.charset"));
+	}
 
 	private void updateIndexUniqueMap(HashMap<String, List<DdlDetail>> map, String names, DdlDetail detail) {
 		if (!StringUtil.isNullOrEmpty(names)) {

src/main/java/com/yanglb/codegen/shell/CGShell.java

@@ -27,8 +27,8 @@ public boolean invoke(String[] args) {
 
 		// test data
 //		args = new String[] {"msg.android", "/Users/yanglibing/Work/cg/tests/msg.xlsx", "-s", "#Android"};
-		args = new String[] {"msg.ios", "/Users/yanglibing/Work/cg/tests/msg.xlsx"};
-//		args = new String[] {"ddl.sqlite", "/Users/yanglibing/Work/cg/tests/ddl.xlsx"};
+//		args = new String[] {"msg.ios", "/Users/yanglibing/Work/cg/tests/msg.xlsx"};
+		args = new String[] {"ddl.mysql", "/Users/yanglibing/Work/cg/tests/ddl.xlsx", "-engine", "MyBTT", "-charset", "utf-8", "-h"};
 //		args = new String[] {"dml", "/Users/yanglibing/Work/cg/tests/dml.xlsx"};
 //		args = new String[] {"", "-h"};
 //		args = new String[] {"msg.prop", "message.xlsx", "-out", "src/main/resources"};

src/main/java/com/yanglb/codegen/utils/Conf.java

@@ -16,6 +16,7 @@
 package com.yanglb.codegen.utils;
 
 import com.yanglb.codegen.model.CmdModel;
+import org.omg.CORBA.SetOverrideType;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
@@ -49,6 +50,7 @@ public static CmdModel getCmdModel(String cmd) {
 
 	public static String CATEGORY_READER = "reader";
 	public static String CATEGORY_WRITER = "writer";
+	public static String CATEGORY_SETTINGS = "settings";
 
 	public static String getString(String category, String key) {
 		// 初始化
@@ -59,6 +61,10 @@ public static String getString(String category, String key) {
 		return value;
 	}
 
+	public static String getSetting(String key) {
+		return getString(CATEGORY_SETTINGS, key);
+	}
+
 	public static List<String> supportCommands() {
 		init();
 

src/main/resources/conf.yaml

@@ -1,7 +1,7 @@
 # Commands
 command:
   ddl.mysql:
-    parser: .core.parser.impl.DdlParser
+    parser: .core.parser.impl.DdlMySqlParser
     generator: .core.generator.impl.DdlGeneratorImpl
     reader: .core.reader.impl.DdlReaderImpl
     translator: .core.translator.impl.DdlMysqlTranslatorImpl
@@ -56,3 +56,8 @@ writer:
 # reader
 reader:
   table: .core.reader.impl.TableReaderImpl
+
+# Default settings
+settings:
+  mysql.engine: InnoDB
+  mysql.charset: utf8