Make ExtendedQueryCommand prepared statement immutable.

vietj · vietj · commit 0b2633bf17cc · 2025-07-01T13:31:40.000+02:00
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java
@@ -16,7 +16,6 @@
 package io.vertx.db2client.impl;
 
 import io.netty.channel.ChannelPipeline;
-import io.vertx.core.AsyncResult;
 import io.vertx.core.Completable;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
@@ -26,11 +25,15 @@
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.impl.codec.CommandCodec;
 import io.vertx.db2client.impl.codec.DB2Codec;
+import io.vertx.db2client.impl.codec.DB2PreparedStatement;
+import io.vertx.db2client.impl.codec.ExtendedBatchQueryCommandCodec;
+import io.vertx.db2client.impl.codec.ExtendedQueryCommandCodec;
 import io.vertx.db2client.impl.command.InitialHandshakeCommand;
 import io.vertx.db2client.impl.drda.ConnectionMetaData;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.impl.CommandMessage;
 import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 import io.vertx.sqlclient.internal.command.*;
@@ -81,6 +84,15 @@ public void init() {
     super.init();
   }
 
+  @Override
+  protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
+    if (command.isBatch()) {
+      return new ExtendedBatchQueryCommandCodec<>(command, (DB2PreparedStatement) preparedStatement);
+    } else {
+      return new ExtendedQueryCommandCodec(command, (DB2PreparedStatement) preparedStatement);
+    }
+  }
+
   @Override
   protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
     return CommandCodec.wrap(command);
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CommandCodec.java
@@ -47,13 +47,6 @@ public abstract class CommandCodec<R, C extends CommandBase<R>> extends CommandM
       codec = new InitialHandshakeCommandCodec((InitialHandshakeCommand) cmd);
     } else if (cmd instanceof SimpleQueryCommand) {
       codec = new SimpleQueryCommandCodec((SimpleQueryCommand) cmd);
-    } else if (cmd instanceof ExtendedQueryCommand) {
-      ExtendedQueryCommand<?> queryCmd = (ExtendedQueryCommand<?>) cmd;
-      if (queryCmd.isBatch()) {
-        codec = new ExtendedBatchQueryCommandCodec<>(queryCmd);
-      } else {
-        codec = new ExtendedQueryCommandCodec(queryCmd);
-      }
     } else if (cmd instanceof CloseConnectionCommand) {
       codec = new CloseConnectionCommandCodec((CloseConnectionCommand) cmd);
     } else if (cmd instanceof PrepareStatementCommand) {
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2PreparedStatement.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2PreparedStatement.java
@@ -28,7 +28,7 @@
 import io.vertx.sqlclient.internal.RowDesc;
 import io.vertx.sqlclient.internal.TupleInternal;
 
-class DB2PreparedStatement implements PreparedStatement {
+public class DB2PreparedStatement implements PreparedStatement {
 
   private static final Logger LOG = LoggerFactory.getLogger(DB2PreparedStatement.class);
 
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryCommandCodec.java
@@ -31,16 +31,16 @@
 import io.vertx.sqlclient.impl.CommandResponse;
 import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 
-class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
+public class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 
   private static final Logger LOG = LoggerFactory.getLogger(ExtendedBatchQueryCommandCodec.class);
 
   private final List<TupleInternal> params;
   private final List<QueryInstance> queryInstances;
   private final String baseCursorId;
 
-  ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<R> cmd) {
-    super(cmd);
+  public ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<R> cmd, DB2PreparedStatement statement) {
+    super(cmd, statement);
     params = cmd.paramsList();
     queryInstances = new ArrayList<>(params.size());
     baseCursorId = (cmd.cursorId() == null ? UUID.randomUUID().toString() : cmd.cursorId()) + "-";
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java
@@ -35,10 +35,10 @@ abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R
 
   final DB2PreparedStatement statement;
 
-  ExtendedQueryCommandBaseCodec(C cmd) {
+  ExtendedQueryCommandBaseCodec(C cmd, DB2PreparedStatement statement) {
     super(cmd);
-    statement = (DB2PreparedStatement) cmd.preparedStatement();
-    columnDefinitions = statement.rowDesc.columnDefinitions();
+    this.statement = statement;
+    this.columnDefinitions = statement.rowDesc.columnDefinitions();
   }
 
   void encodePreparedQuery(DRDAQueryRequest queryRequest, QueryInstance queryInstance, Tuple params) {
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandCodec.java
@@ -22,12 +22,12 @@
 import io.vertx.sqlclient.impl.CommandResponse;
 import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 
-class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
+public class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 
   final QueryInstance queryInstance;
 
-  ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd) {
-    super(cmd);
+  public ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd, DB2PreparedStatement statement) {
+    super(cmd, statement);
     queryInstance = statement.getQueryInstance(cmd.cursorId());
   }
 
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java
@@ -29,7 +29,9 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.mssqlclient.MSSQLConnectOptions;
 import io.vertx.mssqlclient.MSSQLInfo;
+import io.vertx.mssqlclient.impl.codec.ExtendedQueryCommandBaseCodec;
 import io.vertx.mssqlclient.impl.codec.MSSQLCommandCodec;
+import io.vertx.mssqlclient.impl.codec.MSSQLPreparedStatement;
 import io.vertx.mssqlclient.impl.codec.TdsLoginSentCompletionHandler;
 import io.vertx.mssqlclient.impl.codec.TdsMessageCodec;
 import io.vertx.mssqlclient.impl.codec.TdsPacketDecoder;
@@ -38,6 +40,7 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.impl.CommandMessage;
 import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 import io.vertx.sqlclient.internal.command.*;
@@ -149,6 +152,11 @@ public void init() {
     super.init();
   }
 
+  @Override
+  protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
+    return ExtendedQueryCommandBaseCodec.create(command, (MSSQLPreparedStatement)preparedStatement);
+  }
+
   @Override
   protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
     return MSSQLCommandCodec.wrap(command);
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java
@@ -25,8 +25,8 @@ class ExtendedBatchQueryCommandCodec<T> extends ExtendedQueryCommandBaseCodec<T>
   private int paramsIdx;
   private int messageDecoded;
 
-  ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<T> cmd) {
-    super(cmd);
+  ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {
+    super(cmd, ps);
     paramsList = cmd.paramsList();
   }
 
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java
@@ -23,8 +23,8 @@ class ExtendedCursorQueryCommandCodec<T> extends ExtendedQueryCommandBaseCodec<T
 
   private CursorData cursorData;
 
-  ExtendedCursorQueryCommandCodec(ExtendedQueryCommand<T> cmd) {
-    super(cmd);
+  ExtendedCursorQueryCommandCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {
+    super(cmd, ps);
   }
 
   @Override
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java
@@ -19,22 +19,22 @@
 import static io.vertx.mssqlclient.impl.codec.DataType.*;
 import static io.vertx.mssqlclient.impl.codec.MessageType.RPC;
 
-abstract class ExtendedQueryCommandBaseCodec<T> extends QueryCommandBaseCodec<T, ExtendedQueryCommand<T>> {
+public abstract class ExtendedQueryCommandBaseCodec<T> extends QueryCommandBaseCodec<T, ExtendedQueryCommand<T>> {
 
   final MSSQLPreparedStatement ps;
 
-  ExtendedQueryCommandBaseCodec(ExtendedQueryCommand<T> cmd) {
+  public ExtendedQueryCommandBaseCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {
     super(cmd);
-    ps = (MSSQLPreparedStatement) this.cmd.preparedStatement();
+    this.ps = ps;
   }
 
-  public static <U> MSSQLCommandCodec<?, ?> create(ExtendedQueryCommand<U> queryCmd) {
+  public static <U> MSSQLCommandCodec<?, ?> create(ExtendedQueryCommand<U> queryCmd, MSSQLPreparedStatement ps) {
     if (queryCmd.isBatch()) {
-      return new ExtendedBatchQueryCommandCodec<>(queryCmd);
+      return new ExtendedBatchQueryCommandCodec<>(queryCmd, ps);
     } else if (queryCmd.cursorId() != null) {
-      return new ExtendedCursorQueryCommandCodec<>(queryCmd);
+      return new ExtendedCursorQueryCommandCodec<>(queryCmd, ps);
     } else {
-      return new ExtendedQueryCommandCodec<>(queryCmd);
+      return new ExtendedQueryCommandCodec<>(queryCmd, ps);
     }
   }
 
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java
@@ -16,8 +16,8 @@
 
 class ExtendedQueryCommandCodec<T> extends ExtendedQueryCommandBaseCodec<T> {
 
-  ExtendedQueryCommandCodec(ExtendedQueryCommand<T> cmd) {
-    super(cmd);
+  ExtendedQueryCommandCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {
+    super(cmd, ps);
   }
 
   @Override
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java
@@ -53,8 +53,6 @@ public abstract class MSSQLCommandCodec<R, C extends CommandBase<R>> extends Com
       return new SQLBatchCommandCodec<>((SimpleQueryCommand<?>) cmd);
     } else if (cmd instanceof PrepareStatementCommand) {
       return new PrepareStatementCodec((PrepareStatementCommand) cmd);
-    } else if (cmd instanceof ExtendedQueryCommand) {
-      return ExtendedQueryCommandBaseCodec.create((ExtendedQueryCommand<?>) cmd);
     } else if (cmd instanceof CloseStatementCommand) {
       return new CloseStatementCommandCodec((CloseStatementCommand) cmd);
     } else if (cmd == CloseConnectionCommand.INSTANCE) {
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java
@@ -29,15 +29,20 @@
 import io.vertx.mysqlclient.SslMode;
 import io.vertx.mysqlclient.impl.codec.ClearCachedStatementsEvent;
 import io.vertx.mysqlclient.impl.codec.CommandCodec;
+import io.vertx.mysqlclient.impl.codec.ExtendedBatchQueryCommandCodec;
+import io.vertx.mysqlclient.impl.codec.ExtendedQueryCommandCodec;
 import io.vertx.mysqlclient.impl.codec.MySQLCodec;
 import io.vertx.mysqlclient.impl.codec.MySQLPacketDecoder;
+import io.vertx.mysqlclient.impl.codec.MySQLPreparedStatement;
 import io.vertx.mysqlclient.impl.command.InitialHandshakeCommand;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.impl.CommandMessage;
 import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 import io.vertx.sqlclient.internal.command.CommandBase;
+import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 import io.vertx.sqlclient.internal.command.QueryCommandBase;
 import io.vertx.sqlclient.internal.command.SimpleQueryCommand;
 import io.vertx.sqlclient.internal.command.TxCommand;
@@ -98,6 +103,15 @@ public void init() {
     super.init();
   }
 
+  @Override
+  protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
+    if (command.isBatch()) {
+      return new ExtendedBatchQueryCommandCodec<>(command, (MySQLPreparedStatement) preparedStatement);
+    } else {
+      return new ExtendedQueryCommandCodec<>(command, (MySQLPreparedStatement) preparedStatement);
+    }
+  }
+
   @Override
   protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
     return CommandCodec.wrap(command);
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java
@@ -61,13 +61,6 @@ public abstract class CommandCodec<R, C extends CommandBase<R>> extends CommandM
       return new InitialHandshakeCommandCodec((InitialHandshakeCommand) cmd);
     } else if (cmd instanceof SimpleQueryCommand) {
       return new SimpleQueryCommandCodec<>((SimpleQueryCommand<?>) cmd);
-    } else if (cmd instanceof ExtendedQueryCommand) {
-      ExtendedQueryCommand<?> queryCmd = (ExtendedQueryCommand<?>) cmd;
-      if (queryCmd.isBatch()) {
-        return new ExtendedBatchQueryCommandCodec<>(queryCmd);
-      } else {
-        return new ExtendedQueryCommandCodec<>(queryCmd);
-      }
     } else if (cmd instanceof CloseConnectionCommand) {
       return new CloseConnectionCommandCodec((CloseConnectionCommand) cmd);
     } else if (cmd instanceof PrepareStatementCommand) {
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java
@@ -25,16 +25,16 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.*;
 
-class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
+public class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 
   private final List<TupleInternal> params;
   private final BitSet bindingFailures;
   private boolean pipeliningEnabled;
   private int sent;
   private int received;
 
-  ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<R> cmd) {
-    super(cmd);
+  public ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
+    super(cmd, statement);
     params = cmd.paramsList();
     bindingFailures = new BitSet(params.size());
   }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java
@@ -25,9 +25,9 @@ abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R
 
   protected final MySQLPreparedStatement statement;
 
-  ExtendedQueryCommandBaseCodec(C cmd) {
+  ExtendedQueryCommandBaseCodec(C cmd, MySQLPreparedStatement statement) {
     super(cmd, DataFormat.BINARY);
-    statement = (MySQLPreparedStatement) cmd.preparedStatement();
+    this.statement = statement;
   }
 
   @Override
@@ -52,9 +52,8 @@ protected void handleAllResultsetDecodingCompleted() {
   }
 
   protected void closePreparedStatement() {
-    MySQLPreparedStatement ps = (MySQLPreparedStatement) this.cmd.ps;
-    if (ps.closeAfterUsage) {
-      sendCloseStatementCommand(ps);
+    if (statement.closeAfterUsage) {
+      sendCloseStatementCommand(statement);
     }
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java
@@ -26,9 +26,9 @@
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.CURSOR_TYPE_NO_CURSOR;
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.CURSOR_TYPE_READ_ONLY;
 
-class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
-  ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd) {
-    super(cmd);
+public class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
+  public ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
+    super(cmd, statement);
     if (cmd.fetch() > 0 && statement.isCursorOpen) {
       // restore the state we need for decoding fetch response based on the prepared statement
       columnDefinitions = statement.rowDesc.columnDefinitions();
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java
@@ -31,7 +31,7 @@
 
 import java.util.Arrays;
 
-class MySQLPreparedStatement implements PreparedStatement {
+public class MySQLPreparedStatement implements PreparedStatement {
 
   final long statementId;
   final String sql;
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java
@@ -141,7 +141,7 @@ public void close(Holder holder, Completable<Void> promise) {
       context.runOnContext(v -> close(holder, promise));
     }
   }
-  
+
   public Future<Void> afterAcquire() {
     PromiseInternal<Void> promise = context.owner().promise();
     context.<Void>executeBlocking(() -> {
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java
@@ -27,13 +27,15 @@
 import io.vertx.core.internal.net.NetSocketInternal;
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgException;
+import io.vertx.pgclient.impl.codec.ExtendedQueryCommandCodec;
 import io.vertx.pgclient.impl.codec.NoticeResponse;
 import io.vertx.pgclient.impl.codec.PgCodec;
 import io.vertx.pgclient.impl.codec.PgCommandCodec;
 import io.vertx.pgclient.impl.codec.TxFailedEvent;
 import io.vertx.sqlclient.impl.CommandMessage;
 import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.impl.Notification;
+import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 import io.vertx.sqlclient.internal.command.*;
@@ -172,6 +174,11 @@ protected <R> void doSchedule(CommandBase<R> cmd, Completable<R> handler) {
     }
   }
 
+  @Override
+  protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
+    return new ExtendedQueryCommandCodec<>((ExtendedQueryCommand<?>) command, preparedStatement);
+  }
+
   @Override
   protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
     return PgCommandCodec.wrap(command);
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/ExtendedQueryCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/ExtendedQueryCommand.java

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class ExtendedBatchQueryCommandCodec<T> extends ExtendedQueryCommandBaseCodec<T>`
`25`	`25`	`private int paramsIdx;`
`26`	`26`	`private int messageDecoded;`
`27`	`27`
`28`		`- ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<T> cmd) {`
`29`		`- super(cmd);`
	`28`	`+ ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {`
	`29`	`+ super(cmd, ps);`
`30`	`30`	`paramsList = cmd.paramsList();`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ class ExtendedCursorQueryCommandCodec<T> extends ExtendedQueryCommandBaseCodec<T`
`23`	`23`
`24`	`24`	`private CursorData cursorData;`
`25`	`25`
`26`		`- ExtendedCursorQueryCommandCodec(ExtendedQueryCommand<T> cmd) {`
`27`		`- super(cmd);`
	`26`	`+ ExtendedCursorQueryCommandCodec(ExtendedQueryCommand<T> cmd, MSSQLPreparedStatement ps) {`
	`27`	`+ super(cmd, ps);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`