Merge pull request #54 from vert-x3/issues/issue-53

Fixes #53: TS WITHOUT TZ are returned as String, TS WITH TZ are conve…

Author: Narigo

src/main/asciidoc/groovy/index.adoc

@@ -15,7 +15,7 @@ application.
 
 To use this client, you need to add the following jar to your `CLASSPATH`:
 
-* vertx-mysql-postgresql-client 3.3.2 (the client)
+* vertx-mysql-postgresql-client 3.4.0-SNAPSHOT (the client)
 * scala-library 2.11.4
 * the postgress-async-2.11 and mysdql-async-2.11 from https://github.com/mauricio/postgresql-async
 * joda time
@@ -33,15 +33,15 @@ If you are building a _Fat-jar_ using Maven or Gradle, just add the following de
 <dependency>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-mysql-postgresql-client</artifactId>
-  <version>3.3.2</version>
+  <version>3.4.0-SNAPSHOT</version>
 </dependency>
 ----
 
 * Gradle (in your `build.gradle` file):
 
 [source,groovy,subs="+attributes"]
 ----
-compile 'io.vertx:vertx-mysql-postgresql-client:3.3.2'
+compile 'io.vertx:vertx-mysql-postgresql-client:3.4.0-SNAPSHOT'
 ----
 
 === In an application using a vert.x distributions

src/main/asciidoc/java/index.adoc

@@ -15,7 +15,7 @@ application.
 
 To use this client, you need to add the following jar to your `CLASSPATH`:
 
-* vertx-mysql-postgresql-client 3.3.2 (the client)
+* vertx-mysql-postgresql-client 3.4.0-SNAPSHOT (the client)
 * scala-library 2.11.4
 * the postgress-async-2.11 and mysdql-async-2.11 from https://github.com/mauricio/postgresql-async
 * joda time
@@ -33,15 +33,15 @@ If you are building a _Fat-jar_ using Maven or Gradle, just add the following de
 <dependency>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-mysql-postgresql-client</artifactId>
-  <version>3.3.2</version>
+  <version>3.4.0-SNAPSHOT</version>
 </dependency>
 ----
 
 * Gradle (in your `build.gradle` file):
 
 [source,groovy,subs="+attributes"]
 ----
-compile 'io.vertx:vertx-mysql-postgresql-client:3.3.2'
+compile 'io.vertx:vertx-mysql-postgresql-client:3.4.0-SNAPSHOT'
 ----
 
 === In an application using a vert.x distributions

src/main/asciidoc/js/index.adoc

@@ -15,7 +15,7 @@ application.
 
 To use this client, you need to add the following jar to your `CLASSPATH`:
 
-* vertx-mysql-postgresql-client 3.3.2 (the client)
+* vertx-mysql-postgresql-client 3.4.0-SNAPSHOT (the client)
 * scala-library 2.11.4
 * the postgress-async-2.11 and mysdql-async-2.11 from https://github.com/mauricio/postgresql-async
 * joda time
@@ -33,15 +33,15 @@ If you are building a _Fat-jar_ using Maven or Gradle, just add the following de
 <dependency>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-mysql-postgresql-client</artifactId>
-  <version>3.3.2</version>
+  <version>3.4.0-SNAPSHOT</version>
 </dependency>
 ----
 
 * Gradle (in your `build.gradle` file):
 
 [source,groovy,subs="+attributes"]
 ----
-compile 'io.vertx:vertx-mysql-postgresql-client:3.3.2'
+compile 'io.vertx:vertx-mysql-postgresql-client:3.4.0-SNAPSHOT'
 ----
 
 === In an application using a vert.x distributions

src/main/asciidoc/ruby/index.adoc

@@ -15,7 +15,7 @@ application.
 
 To use this client, you need to add the following jar to your `CLASSPATH`:
 
-* vertx-mysql-postgresql-client 3.3.2 (the client)
+* vertx-mysql-postgresql-client 3.4.0-SNAPSHOT (the client)
 * scala-library 2.11.4
 * the postgress-async-2.11 and mysdql-async-2.11 from https://github.com/mauricio/postgresql-async
 * joda time
@@ -33,15 +33,15 @@ If you are building a _Fat-jar_ using Maven or Gradle, just add the following de
 <dependency>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-mysql-postgresql-client</artifactId>
-  <version>3.3.2</version>
+  <version>3.4.0-SNAPSHOT</version>
 </dependency>
 ----
 
 * Gradle (in your `build.gradle` file):
 
 [source,groovy,subs="+attributes"]
 ----
-compile 'io.vertx:vertx-mysql-postgresql-client:3.3.2'
+compile 'io.vertx:vertx-mysql-postgresql-client:3.4.0-SNAPSHOT'
 ----
 
 === In an application using a vert.x distributions

src/main/java/io/vertx/ext/asyncsql/impl/AsyncSQLConnectionImpl.java

@@ -29,16 +29,15 @@
 import io.vertx.ext.sql.TransactionIsolation;
 import io.vertx.ext.sql.UpdateResult;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import scala.Option;
 import scala.concurrent.ExecutionContext;
 import scala.runtime.AbstractFunction1;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.time.Instant;
+import java.util.*;
 
 /**
  * Implementation of {@link SQLConnection} using the {@link AsyncConnectionPool}.
@@ -323,7 +322,7 @@ public Void apply(Object value) {
         } else if (value instanceof LocalDate) {
           array.add(value.toString());
         } else if (value instanceof DateTime) {
-          array.add(value.toString());
+          array.add(Instant.ofEpochMilli(((DateTime) value).getMillis()));
         } else if (value instanceof UUID) {
           array.add(value.toString());
         } else {

src/test/java/io/vertx/ext/asyncsql/MySQLClientTest.java

@@ -94,6 +94,11 @@ public void testInsertedIds(TestContext context) {
     });
   }
 
+  @Override
+  protected void compareInstantStrings(TestContext context, String result, String expected) {
+    context.assertEquals(result, expected.replaceFirst("\\.\\d{3}$", ".000"));
+  }
+
   @Override
   protected String createByteArray1TableColumn() {
     return "BIT(1)";

src/test/java/io/vertx/ext/asyncsql/SQLTestBase.java

@@ -29,6 +29,7 @@
 import org.junit.Test;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -602,6 +603,40 @@ public void testInvalidInsertStatement(TestContext context) {
     });
   }
 
+  @Test
+  public void testInstant(TestContext context) {
+    Async async = context.async();
+    client.getConnection(ar -> {
+      ensureSuccess(context, ar);
+      conn = ar.result();
+      conn.execute("DROP TABLE IF EXISTS test_table", ar1 -> {
+        ensureSuccess(context, ar1);
+        conn.execute("CREATE TABLE test_table (instant TIMESTAMP)", ar2 -> {
+          ensureSuccess(context, ar2);
+          Instant now = Instant.now();
+          conn.queryWithParams("INSERT INTO test_table (instant) VALUES (?)", new JsonArray().add(now), ar3 -> {
+            ensureSuccess(context, ar3);
+            conn.query("SELECT instant FROM test_table", ar4 -> {
+              ensureSuccess(context, ar4);
+              // timestamps with out time zone are returned as strings, so we must compare to the original instant
+              // ignoring the timezone offset (meaning ignore everything after char 23)
+              compareInstantStrings(
+                  context,
+                  ar4.result().getResults().get(0).getString(0),
+                  now.toString().substring(0, 23)
+              );
+              async.complete();
+            });
+          });
+        });
+      });
+    });
+  }
+
+  protected void compareInstantStrings(TestContext context, String result, String expected) {
+    context.assertEquals(result, expected);
+  }
+
   protected void setSqlModeIfPossible(Handler<Void> handler) {
     handler.handle(null);
   }