From 7f49be57a0ace01369e2c03ab32cdc60b383c30c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 14 Dec 2019 19:00:30 +0800 Subject: [PATCH] 1.fix a convert bug --- build.gradle | 2 +- src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 74c5644..a321496 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java b/src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java index 11839ff..494d605 100644 --- a/src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java +++ b/src/main/java/com/taover/codegenerate/core/MysqlTableColumn.java @@ -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"; } -- libgit2 0.21.2