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