1.4.13

changelog.md

@@ -1,5 +1,9 @@
 # changelog
 
+## 1.4.13
+
+- 优化类型转换
+
 ## 1.4.12
 
 - PostgreSQL数据源可指定schema（模板中可使用：`${table.schema}`）

gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java

@@ -4,6 +4,7 @@ import com.gitee.gen.gen.ColumnDefinition;
 import com.gitee.gen.gen.ColumnSelector;
 import com.gitee.gen.gen.GeneratorConfig;
 import com.gitee.gen.gen.TypeFormatter;
+import com.gitee.gen.util.FieldUtil;
 
 import java.util.Map;
 import java.util.Set;
@@ -42,19 +43,19 @@ public class MySqlColumnSelector extends ColumnSelector {
 		}
 		
 		ColumnDefinition columnDefinition = new ColumnDefinition();
+
+		columnDefinition.setColumnName(FieldUtil.convertString(rowMap.get("FIELD")));
 		
-		columnDefinition.setColumnName((String)rowMap.get("FIELD"));
-		
-		boolean isIdentity = "auto_increment".equalsIgnoreCase((String)rowMap.get("EXTRA"));
+		boolean isIdentity = "auto_increment".equalsIgnoreCase(FieldUtil.convertString(rowMap.get("EXTRA")));
 		columnDefinition.setIsIdentity(isIdentity);
 		
-		boolean isPk = "PRI".equalsIgnoreCase((String)rowMap.get("KEY"));
+		boolean isPk = "PRI".equalsIgnoreCase(FieldUtil.convertString(rowMap.get("KEY")));
 		columnDefinition.setIsPk(isPk);
 		
-		String type = (String)rowMap.get("TYPE");
+		String type = FieldUtil.convertString(rowMap.get("TYPE"));
 		columnDefinition.setType(TYPE_FORMATTER.format(type));
 		
-		columnDefinition.setComment((String)rowMap.get("COMMENT"));
+		columnDefinition.setComment(FieldUtil.convertString(rowMap.get("COMMENT")));
 		
 		return columnDefinition;
 	}

gen/src/main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java

@@ -7,6 +7,8 @@ import com.gitee.gen.gen.TableSelector;
 
 import java.util.Map;
 
+import static com.gitee.gen.util.FieldUtil.convertString;
+
 /**
  * 查询mysql数据库表
  */
@@ -36,8 +38,8 @@ public class MySqlTableSelector extends TableSelector {
 	@Override
 	protected TableDefinition buildTableDefinition(Map<String, Object> tableMap) {
 		TableDefinition tableDefinition = new TableDefinition();
-		tableDefinition.setTableName((String)tableMap.get("NAME"));
-		tableDefinition.setComment((String)tableMap.get("COMMENT"));
+		tableDefinition.setTableName(convertString(tableMap.get("NAME")));
+		tableDefinition.setComment(convertString(tableMap.get("COMMENT")));
 		return tableDefinition;
 	}
 

gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java

@@ -4,6 +4,7 @@ import com.gitee.gen.gen.ColumnDefinition;
 import com.gitee.gen.gen.ColumnSelector;
 import com.gitee.gen.gen.GeneratorConfig;
 import com.gitee.gen.gen.TypeFormatter;
+import com.gitee.gen.util.FieldUtil;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.Map;
@@ -56,14 +57,14 @@ public class OracleColumnSelector extends ColumnSelector {
 		
 		ColumnDefinition columnDefinition = new ColumnDefinition();
 		
-		columnDefinition.setColumnName((String)rowMap.get("FIELD"));
+		columnDefinition.setColumnName(FieldUtil.convertString(rowMap.get("FIELD")));
 
 		columnDefinition.setIsIdentity(false);
 		
-		boolean isPk = "true".equalsIgnoreCase((String)rowMap.get("KEY"));
+		boolean isPk = "true".equalsIgnoreCase(FieldUtil.convertString(rowMap.get("KEY")));
 		columnDefinition.setIsPk(isPk);
 		
-		String type = (String)rowMap.get("TYPE");
+		String type = FieldUtil.convertString(rowMap.get("TYPE"));
 		// 如果是number
 		if (StringUtils.containsIgnoreCase(type, "number")) {
 			// 有精度则为decimal，否则是int
@@ -76,7 +77,7 @@ public class OracleColumnSelector extends ColumnSelector {
 		}
 		columnDefinition.setType(TYPE_FORMATTER.format(type));
 		
-		columnDefinition.setComment((String)rowMap.get("COMMENTS"));
+		columnDefinition.setComment(FieldUtil.convertString(rowMap.get("COMMENTS")));
 
 		return columnDefinition;
 	}

gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java

@@ -7,6 +7,8 @@ import com.gitee.gen.gen.TableSelector;
 
 import java.util.Map;
 
+import static com.gitee.gen.util.FieldUtil.convertString;
+
 /**
  * 查询mysql数据库表
  */
@@ -46,8 +48,8 @@ public class OracleTableSelector extends TableSelector {
 	@Override
 	protected TableDefinition buildTableDefinition(Map<String, Object> tableMap) {
 		TableDefinition tableDefinition = new TableDefinition();
-		tableDefinition.setTableName((String)tableMap.get("NAME"));
-		tableDefinition.setComment((String)tableMap.get("COMMENTS"));
+		tableDefinition.setTableName(convertString(tableMap.get("NAME")));
+		tableDefinition.setComment(convertString(tableMap.get("COMMENTS")));
 		return tableDefinition;
 	}
 

gen/src/main/java/com/gitee/gen/gen/sqlserver/SqlServerColumnSelector.java

@@ -3,6 +3,7 @@ package com.gitee.gen.gen.sqlserver;
 import com.gitee.gen.gen.ColumnDefinition;
 import com.gitee.gen.gen.ColumnSelector;
 import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.util.FieldUtil;
 
 import java.util.Map;
 import java.util.Set;
@@ -92,14 +93,14 @@ public class SqlServerColumnSelector extends ColumnSelector {
 		
 		ColumnDefinition columnDefinition = new ColumnDefinition();
 		
-		columnDefinition.setColumnName((String)rowMap.get("COLUMN_NAME"));
+		columnDefinition.setColumnName(FieldUtil.convertString(rowMap.get("COLUMN_NAME")));
 		columnDefinition.setIsIdentity((Boolean)rowMap.get("IS_IDENTITY"));
 		boolean isPk = (Integer)rowMap.get("IS_PK") == 1;
 		columnDefinition.setIsPk(isPk);
-		String type = (String) rowMap.get("TYPE");
+		String type = FieldUtil.convertString( rowMap.get("TYPE"));
 		columnDefinition.setType(TYPE_FORMATTER.format(type));
 		
-		columnDefinition.setComment((String)rowMap.get("COMMENT"));
+		columnDefinition.setComment(FieldUtil.convertString(rowMap.get("COMMENT")));
 		
 		return columnDefinition;
 	}

gen/src/main/java/com/gitee/gen/gen/sqlserver/SqlServerTableSelector.java

@@ -7,6 +7,8 @@ import com.gitee.gen.gen.TableSelector;
 
 import java.util.Map;
 
+import static com.gitee.gen.util.FieldUtil.convertString;
+
 public class SqlServerTableSelector extends TableSelector {
 	
 	public SqlServerTableSelector(ColumnSelector columnSelector,
@@ -50,8 +52,8 @@ public class SqlServerTableSelector extends TableSelector {
 	@Override
 	protected TableDefinition buildTableDefinition(Map<String, Object> tableMap) {
 		TableDefinition tableDefinition = new TableDefinition();
-		tableDefinition.setTableName((String)tableMap.get("TABLE_NAME"));
-		tableDefinition.setComment((String)tableMap.get("COMMENT"));
+		tableDefinition.setTableName(convertString(tableMap.get("TABLE_NAME")));
+		tableDefinition.setComment(convertString(tableMap.get("COMMENT")));
 		return tableDefinition;
 	}