Merge pull request #29 from darkredz/dev

Dev
darkredz · May 30, 2020 · 921f227 · 921f227
2 parents 1057e3a + e2e525c
commit 921f227
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -752,7 +752,7 @@ Add this to your maven pom.xml
     <dependency>
       <groupId>io.zeko</groupId>
       <artifactId>zeko-sql-builder</artifactId>
-      <version>1.1.7</version>
+      <version>1.1.8</version>
     </dependency>
 
     <!-- Jasync Mysql driver if needed -->

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.zeko</groupId>
     <artifactId>zeko-sql-builder</artifactId>
-    <version>1.1.8-SNAPSHOT</version>
+    <version>1.1.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/src/main/kotlin/io/zeko/model/Entity.kt b/src/main/kotlin/io/zeko/model/Entity.kt
@@ -96,11 +96,15 @@ abstract class Entity {
                     //Vertx JDBC client returns date time field as String and already converted to UTC
                     val pattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
                     val systemZoneDateTime = ZonedDateTime.parse(value, pattern).withZoneSameInstant(ZoneId.systemDefault())
-                    return systemZoneDateTime.toLocalDateTime()
+                    systemZoneDateTime.toLocalDateTime()
                 }
             }
             Type.DATE -> {
-                LocalDate.parse(value.toString())
+                if (value is java.util.Date) {
+                    value.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
+                } else {
+                    LocalDate.parse(value.toString())
+                }
             }
             Type.ZONEDATETIME_UTC -> {
                 if (value !is String) {