WIP - managed to get bytes out from query result

eclipse-vertx · Apr 28, 2023 · 1049e12 · 1049e12
1 parent 7308490
commit 1049e12
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java
@@ -145,7 +145,8 @@ public Future<SqlResult<Buffer>> copyToBytes(String sql) {
       new QueryResultBuilder<>(factory, promise);
 
     CopyOutCommand cmd = new CopyOutCommand(sql, resultHandler);
-    return this.schedule(promise.context(), cmd);
+    this.schedule(promise.context(), cmd).onComplete(resultHandler);
+    return promise.future();
   }
 
   @Override

diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CopyOutCommand.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CopyOutCommand.java
@@ -9,7 +9,7 @@
 
 import java.util.stream.Collector;
 
-public class CopyOutCommand extends CommandBase<SqlResult<Buffer>> {
+public class CopyOutCommand extends CommandBase<Boolean> {
   private final String sql;
   private final Collector<ByteBuf, Buffer, Buffer> collector;
   private final QueryResultBuilder<Buffer, SqlResultImpl<Buffer>, SqlResult<Buffer>> resultHandler;

diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CopyOutCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CopyOutCommandCodec.java
@@ -5,7 +5,7 @@
 import io.vertx.sqlclient.SqlResult;
 import io.vertx.sqlclient.impl.SqlResultImpl;
 
-class CopyOutCommandCodec extends PgCommandCodec<SqlResult<Buffer>, CopyOutCommand> {
+class CopyOutCommandCodec extends PgCommandCodec<Boolean, CopyOutCommand> {
   CopyOutDataDecoder decoder;
 
   CopyOutCommandCodec(CopyOutCommand cmd) {
@@ -15,7 +15,7 @@ class CopyOutCommandCodec extends PgCommandCodec<SqlResult<Buffer>, CopyOutComma
 
   @Override
   public void handleCommandComplete(int updated) {
-    this.result = new SqlResultImpl<Buffer>(Buffer.buffer("abc"));
+    this.result = false;
     Buffer result;
     Throwable failure;
     int size;

diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionCopyTest.java b/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionCopyTest.java
@@ -1,9 +1,13 @@
 package io.vertx.pgclient;
 
+import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import org.junit.Test;
 
+import java.util.Collections;
+import java.util.List;
+
 public class PgConnectionCopyTest extends PgConnectionTestBase {
   public PgConnectionCopyTest() {
     connector = (handler) -> PgConnection.connect(vertx, options).onComplete(ar -> {
@@ -41,7 +45,24 @@ public void testCopyToCsvBytes(TestContext ctx) {
           PgConnection pgConn = (PgConnection) conn;
           pgConn.copyToBytes("COPY Test TO STDOUT (FORMAT csv)")
             .onComplete(ctx.asyncAssertSuccess(result -> {
-              result.value().getBytes();
+              ctx.assertNull(result.columnDescriptors());
+              ctx.assertEquals(10, result.rowCount());
+              ctx.assertEquals(10, result.size());
+              ctx.assertEquals(
+                Buffer.buffer(
+                  "Whatever-0\n" +
+                  "Whatever-1\n" +
+                  "Whatever-2\n" +
+                  "Whatever-3\n" +
+                  "Whatever-4\n" +
+                  "Whatever-5\n" +
+                  "Whatever-6\n" +
+                  "Whatever-7\n" +
+                  "Whatever-8\n" +
+                  "Whatever-9\n"
+                ),
+                result.value()
+              );
               async.complete();
             }));
         });