Merge pull request #31 from darkredz/dev

Dev
darkredz · Dec 7, 2020 · be91689 · be91689
2 parents 2ae046f + 6f089db
commit be91689
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 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.2.0</version>
+      <version>1.2.1</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.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/src/main/kotlin/io/zeko/db/sql/Query.kt b/src/main/kotlin/io/zeko/db/sql/Query.kt
@@ -353,6 +353,11 @@ open class Query {
         return this
     }
 
+    fun groupByMain(vararg fields: String): Query {
+        addExpressionAfter(CustomPart.WHERE, QueryBlock("GROUP BY", if (fields.size == 1) fields[0] else fields.joinToString(", ")))
+        return this
+    }
+
     fun groupBy(vararg fields: String): Query {
         groupBys.addAll(fields as Array<String>)
         return this

diff --git a/src/main/kotlin/io/zeko/model/Entity.kt b/src/main/kotlin/io/zeko/model/Entity.kt
@@ -94,7 +94,11 @@ abstract class Entity {
                     LocalDateTime.parse(dateStr, pattern)
                 } else {
                     //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 pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz")
+                    } else {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
+                    }
                     val systemZoneDateTime = ZonedDateTime.parse(value, pattern).withZoneSameInstant(ZoneId.systemDefault())
                     systemZoneDateTime.toLocalDateTime()
                 }
@@ -126,7 +130,11 @@ abstract class Entity {
                     ZonedDateTime.parse(dateStr.removeSuffix("Z") + "Z", pattern)
                 } else {
                     //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 pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz")
+                    } else {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
+                    }
                     val systemZoneDateTime = ZonedDateTime.parse(value, pattern).withZoneSameInstant(ZoneId.systemDefault())
                     val local = systemZoneDateTime.toLocalDateTime()
                     ZonedDateTime.of(local, ZoneId.of("UTC"))
@@ -144,7 +152,11 @@ abstract class Entity {
                     LocalDateTime.parse(dateStr, pattern).atZone(ZoneOffset.UTC).toInstant()
                 } else {
                     //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 pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz")
+                    } else {
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
+                    }
                     val systemZoneDateTime = ZonedDateTime.parse(value, pattern).withZoneSameInstant(ZoneId.systemDefault())
                     val local = systemZoneDateTime.toLocalDateTime()
                     ZonedDateTime.of(local, ZoneId.of("UTC")).toInstant()