1.fix a convert bug

unknown
1 parent f6bfcfb0
Showing 2 changed files with 30 additions and 13 deletions Show diff stats
build.gradle
src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java
@@ -55,7 +55,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.2.14'
+                version '1.2.15'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
@@ -361,11 +361,21 @@ public class MysqlTableColumn {
  
 	public String getJAVADataType() {
 		switch (this.typeName) {		    
-		    case "BOOL":
+			case "BIT":
+		    	if(getColumnSize() > 1) {
+		    		return "byte[]";
+		    	}else {
+		    		return "java.lang.Boolean";
+		    	}
+			case "TINYINT":
+				if(getColumnSize() > 1) {
+					return "java.lang.Integer";
+				}else {
+					return "java.lang.Boolean";
+				}
+			case "BOOL":
 		    case "BOOLEAN":
-		        return "java.lang.Boolean";
-		    case "BIT":
-		    case "TINYINT":
+		        return "java.lang.Boolean";	    
 		    case "TINYINT UNSIGNED":
 		    case "SMALLINT":
 		    case "SMALLINT UNSIGNED":
@@ -383,7 +393,7 @@ public class MysqlTableColumn {
 		    case "FLOAT":
 		    	return "java.lang.Float";
 		    case "DOUBLE":
-		    	return "java.lang.DOUBLE";
+		    	return "java.lang.Double";
 		    case "DECIMAL":
 		    case "DECIMAL UNSIGNED":
 		    	return "java.math.BigDecimal";
@@ -397,20 +407,27 @@ public class MysqlTableColumn {
 			case "CHAR":
 			case "VARCHAR":
 			case "VARCHAR BINARY":
-			case "ENUM":
-			case "SET":
-			case "LONGTEXT":
-			case "MEDIUMTEXT":
-			case "TEXT":
-			case "TINYTEXT":
 				return "java.lang.String";
 			case "BINARY":
 			case "VARBINARY":
 			case "TINYBLOB":
+				return "byte[]";			
+			case "TINYTEXT":
+				return "java.lang.String";
 			case "BLOB":
+				return "byte[]";
+			case "TEXT":
+				return "java.lang.String";
 			case "MEDIUMBLOB":
-			case "LONGBLOB":
 				return "byte[]";
+			case "MEDIUMTEXT":	
+				return "java.lang.String";
+			case "LONGBLOB":
+				return "byte[]";	
+			case "LONGTEXT":								
+			case "ENUM":
+			case "SET":
+				return "java.lang.String";
 		}
 		return "java.lang.String";
 	}
...	...	@@ -55,7 +55,7 @@ uploadArchives {
55	55	authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
56	56	}
57	57	pom.project {
58		- version '1.2.14'
	58	+ version '1.2.15'
59	59	artifactId ARTIFACT_Id
60	60	groupId GROUP_ID
61	61	packaging TYPE
...	...
...	...	@@ -361,11 +361,21 @@ public class MysqlTableColumn {
361	361
362	362	public String getJAVADataType() {
363	363	switch (this.typeName) {
364		- case "BOOL":
	364	+ case "BIT":
	365	+ if(getColumnSize() > 1) {
	366	+ return "byte[]";
	367	+ }else {
	368	+ return "java.lang.Boolean";
	369	+ }
	370	+ case "TINYINT":
	371	+ if(getColumnSize() > 1) {
	372	+ return "java.lang.Integer";
	373	+ }else {
	374	+ return "java.lang.Boolean";
	375	+ }
	376	+ case "BOOL":
365	377	case "BOOLEAN":
366		- return "java.lang.Boolean";
367		- case "BIT":
368		- case "TINYINT":
	378	+ return "java.lang.Boolean";
369	379	case "TINYINT UNSIGNED":
370	380	case "SMALLINT":
371	381	case "SMALLINT UNSIGNED":
...	...	@@ -383,7 +393,7 @@ public class MysqlTableColumn {
383	393	case "FLOAT":
384	394	return "java.lang.Float";
385	395	case "DOUBLE":
386		- return "java.lang.DOUBLE";
	396	+ return "java.lang.Double";
387	397	case "DECIMAL":
388	398	case "DECIMAL UNSIGNED":
389	399	return "java.math.BigDecimal";
...	...	@@ -397,20 +407,27 @@ public class MysqlTableColumn {
397	407	case "CHAR":
398	408	case "VARCHAR":
399	409	case "VARCHAR BINARY":
400		- case "ENUM":
401		- case "SET":
402		- case "LONGTEXT":
403		- case "MEDIUMTEXT":
404		- case "TEXT":
405		- case "TINYTEXT":
406	410	return "java.lang.String";
407	411	case "BINARY":
408	412	case "VARBINARY":
409	413	case "TINYBLOB":
	414	+ return "byte[]";
	415	+ case "TINYTEXT":
	416	+ return "java.lang.String";
410	417	case "BLOB":
	418	+ return "byte[]";
	419	+ case "TEXT":
	420	+ return "java.lang.String";
411	421	case "MEDIUMBLOB":
412		- case "LONGBLOB":
413	422	return "byte[]";
	423	+ case "MEDIUMTEXT":
	424	+ return "java.lang.String";
	425	+ case "LONGBLOB":
	426	+ return "byte[]";
	427	+ case "LONGTEXT":
	428	+ case "ENUM":
	429	+ case "SET":
	430	+ return "java.lang.String";
414	431	}
415	432	return "java.lang.String";
416	433	}
...	...