Move the query place holder mechanism from the SqlClientInternal interface to the Driver interface

vietj · vietj · commit 8d2e10d33b1e · 2021-12-08T12:01:33.000+01:00
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java
@@ -24,6 +24,7 @@
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.DB2Connection;
 import io.vertx.db2client.impl.command.PingCommand;
+import io.vertx.db2client.spi.DB2Driver;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
@@ -44,7 +45,7 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
   }
 
   public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
-    super(context, factory, conn, tracer, metrics);
+    super(context, factory, conn, DB2Driver.INSTANCE, tracer, metrics);
   }
 
   @Override
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2PoolImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2PoolImpl.java
@@ -23,6 +23,7 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.DB2Pool;
+import io.vertx.db2client.spi.DB2Driver;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
@@ -37,7 +38,7 @@
 public class DB2PoolImpl extends PoolBase<DB2PoolImpl> implements DB2Pool {
 
   public DB2PoolImpl(VertxInternal vertx, int pipeliningLimit, PoolOptions poolOptions, DB2ConnectOptions baseConnectOptions, Supplier<Future<SqlConnectOptions>> connectOptionsProvider, QueryTracer tracer, ClientMetrics metrics, CloseFuture closeFuture) {
-    super(vertx, baseConnectOptions, connectOptionsProvider, tracer, metrics, pipeliningLimit, poolOptions, closeFuture);
+    super(vertx, DB2Driver.INSTANCE, baseConnectOptions, connectOptionsProvider, tracer, metrics, pipeliningLimit, poolOptions, closeFuture);
   }
 
   @SuppressWarnings("rawtypes")
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java
@@ -17,6 +17,7 @@
 import io.vertx.mssqlclient.MSSQLConnection;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import io.vertx.mssqlclient.spi.MSSQLDriver;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
@@ -25,13 +26,7 @@
 public class MSSQLConnectionImpl extends SqlConnectionImpl<MSSQLConnectionImpl> implements MSSQLConnection {
 
   public MSSQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
-    super(context, factory, conn, tracer, metrics);
-  }
-
-  @Override
-  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
-    queryBuilder.append('@').append('P').append(1 + index);
-    return index;
+    super(context, factory, conn, MSSQLDriver.INSTANCE, tracer, metrics);
   }
 
   public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions options) {
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLPoolImpl.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLPoolImpl.java
@@ -19,6 +19,7 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.mssqlclient.MSSQLConnectOptions;
 import io.vertx.mssqlclient.MSSQLPool;
+import io.vertx.mssqlclient.spi.MSSQLDriver;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
@@ -33,13 +34,7 @@
 public class MSSQLPoolImpl extends PoolBase<MSSQLPoolImpl> implements MSSQLPool {
 
   public MSSQLPoolImpl(VertxInternal vertx, MSSQLConnectOptions baseConnectOptions, Supplier<Future<SqlConnectOptions>> connectOptionsProvider, QueryTracer tracer, ClientMetrics metrics, PoolOptions poolOptions, CloseFuture closeFuture) {
-    super(vertx, baseConnectOptions, connectOptionsProvider, tracer, metrics, 1, poolOptions, closeFuture);
-  }
-
-  @Override
-  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
-    queryBuilder.append('@').append('P').append(1 + index);
-    return index;
+    super(vertx, MSSQLDriver.INSTANCE, baseConnectOptions, connectOptionsProvider, tracer, metrics, 1, poolOptions, closeFuture);
   }
 
   @Override
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java
@@ -62,4 +62,10 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
     return new MSSQLConnectionFactory((VertxInternal) vertx, MSSQLConnectOptions.wrap(database));
   }
+
+  @Override
+  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
+    queryBuilder.append('@').append('P').append(1 + index);
+    return index;
+  }
 }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java
@@ -22,6 +22,7 @@
 import io.vertx.mysqlclient.MySQLConnection;
 import io.vertx.mysqlclient.MySQLSetOption;
 import io.vertx.mysqlclient.impl.command.*;
+import io.vertx.mysqlclient.spi.MySQLDriver;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
@@ -44,7 +45,7 @@ public static Future<MySQLConnection> connect(ContextInternal ctx, MySQLConnectO
   }
 
   public MySQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
-    super(context, factory, conn, tracer, metrics);
+    super(context, factory, conn, MySQLDriver.INSTANCE, tracer, metrics);
   }
 
   @Override
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLPoolImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLPoolImpl.java
@@ -19,6 +19,7 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.mysqlclient.MySQLConnectOptions;
 import io.vertx.mysqlclient.MySQLPool;
+import io.vertx.mysqlclient.spi.MySQLDriver;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
@@ -33,7 +34,7 @@
 public class MySQLPoolImpl extends PoolBase<MySQLPoolImpl> implements MySQLPool {
 
   public MySQLPoolImpl(VertxInternal vertx, MySQLConnectOptions baseConnectOptions, Supplier<Future<SqlConnectOptions>> connectOptionsProvider, QueryTracer tracer, ClientMetrics metrics, PoolOptions poolOptions, CloseFuture closeFuture) {
-    super(vertx, baseConnectOptions, connectOptionsProvider, tracer, metrics, 1, poolOptions, closeFuture);
+    super(vertx, MySQLDriver.INSTANCE, baseConnectOptions, connectOptionsProvider, tracer, metrics, 1, poolOptions, closeFuture);
   }
 
   @Override
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionFactory.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionFactory.java
@@ -17,6 +17,7 @@
 import io.vertx.core.impl.VertxInternal;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.oracleclient.OracleConnectOptions;
+import io.vertx.oracleclient.spi.OracleDriver;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.impl.Connection;
@@ -69,7 +70,7 @@ public Future<SqlConnection> connect(Context context) {
     ContextInternal ic  = (ContextInternal) context;
     return connect(ic)
       .map(c -> {
-        SqlConnectionImpl connection = new SqlConnectionImpl(ic, this, c, tracer, metrics);
+        SqlConnectionImpl connection = new SqlConnectionImpl(ic, this, c, OracleDriver.INSTANCE, tracer, metrics);
         c.init(connection);
         return connection;
       });
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OraclePoolImpl.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OraclePoolImpl.java
@@ -17,6 +17,7 @@
 import io.vertx.core.impl.future.PromiseInternal;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.oracleclient.OraclePool;
+import io.vertx.oracleclient.spi.OracleDriver;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.impl.SqlClientBase;
@@ -33,7 +34,7 @@ public class OraclePoolImpl extends SqlClientBase<OraclePoolImpl> implements Ora
   private final CloseFuture closeFuture;
 
   public OraclePoolImpl(VertxInternal vertx, OracleConnectionFactory factory, ClientMetrics metrics, QueryTracer tracer, CloseFuture closeFuture) {
-    super(tracer, metrics);
+    super(OracleDriver.INSTANCE, tracer, metrics);
     this.factory = factory;
     this.vertx = vertx;
     this.closeFuture = closeFuture;
@@ -63,7 +64,7 @@ public Future<SqlConnection> getConnection() {
   private Future<SqlConnection> getConnectionInternal(ContextInternal ctx) {
     return factory.connect(ctx)
       .map(c -> {
-        SqlConnectionImpl<?> connection = new SqlConnectionImpl<>(ctx, factory, c, tracer, metrics);
+        SqlConnectionImpl<?> connection = new SqlConnectionImpl<>(ctx, factory, c, OracleDriver.INSTANCE, tracer, metrics);
         c.init(connection);
         return connection;
       });
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
@@ -21,6 +21,7 @@
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgConnection;
 import io.vertx.pgclient.PgNotification;
+import io.vertx.pgclient.spi.PgDriver;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.Notification;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
@@ -52,13 +53,7 @@ public static Future<PgConnection> connect(ContextInternal context, PgConnectOpt
   private volatile Handler<PgNotification> notificationHandler;
 
   public PgConnectionImpl(PgConnectionFactory factory, ContextInternal context, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
-    super(context, factory, conn, tracer, metrics);
-  }
-
-  @Override
-  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
-    queryBuilder.append('$').append(1 + index);
-    return index;
+    super(context, factory, conn, PgDriver.INSTANCE, tracer, metrics);
   }
 
   @Override
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgPoolImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgPoolImpl.java
@@ -23,6 +23,7 @@
 import io.vertx.core.impl.VertxInternal;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.pgclient.*;
+import io.vertx.pgclient.spi.PgDriver;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.impl.Connection;
@@ -43,13 +44,7 @@
 public class PgPoolImpl extends PoolBase<PgPoolImpl> implements PgPool {
 
   public PgPoolImpl(VertxInternal vertx, PgConnectOptions baseConnectOptions, QueryTracer tracer, ClientMetrics metrics, int pipeliningLimit, PoolOptions poolOptions, CloseFuture closeFuture) {
-    super(vertx, baseConnectOptions, null, tracer, metrics, pipeliningLimit, poolOptions, closeFuture);
-  }
-
-  @Override
-  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
-    queryBuilder.append('$').append(1 + index);
-    return index;
+    super(vertx, PgDriver.INSTANCE, baseConnectOptions, null, tracer, metrics, pipeliningLimit, poolOptions, closeFuture);
   }
 
   @Override
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java
@@ -50,4 +50,10 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
     return new PgConnectionFactory((VertxInternal) vertx, PgConnectOptions.wrap(database));
   }
+
+  @Override
+  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
+    queryBuilder.append('$').append(1 + index);
+    return index;
+  }
 }
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/SqlTemplate.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/SqlTemplate.java
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.function.IntFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -30,7 +29,7 @@ public static SqlTemplate create(SqlClientInternal client, List<String> template
       if (it.hasNext()) {
         String val = it.next();
         int idx = mapping.indexOf(val);
-        int actual = client.appendQueryPlaceholder(builder, idx == -1 ? mapping.size() : idx, mapping.size());
+        int actual = client.driver().appendQueryPlaceholder(builder, idx == -1 ? mapping.size() : idx, mapping.size());
         if (idx == -1 || actual != idx) {
           mapping.add(val);
         }
diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TemplateBuilderTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TemplateBuilderTest.java
@@ -3,26 +3,58 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.impl.CloseFuture;
+import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.PrepareOptions;
 import io.vertx.sqlclient.PreparedQuery;
 import io.vertx.sqlclient.Query;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowSet;
 import io.vertx.sqlclient.SqlClient;
+import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.impl.SqlClientInternal;
+import io.vertx.sqlclient.spi.ConnectionFactory;
+import io.vertx.sqlclient.spi.Driver;
 import io.vertx.sqlclient.templates.impl.SqlTemplate;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
 public class TemplateBuilderTest {
 
   private abstract static class FakeClient implements SqlClientInternal {
+    @Override
+    public Driver driver() {
+      return new Driver() {
+        @Override
+        public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
+          return FakeClient.this.appendQueryPlaceholder(queryBuilder, index, current);
+        }
+        @Override
+        public Pool newPool(Vertx vertx, List<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+          throw new UnsupportedOperationException();
+        }
+        @Override
+        public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
+          throw new UnsupportedOperationException();
+        }
+        @Override
+        public boolean acceptsOptions(SqlConnectOptions connectOptions) {
+          throw new UnsupportedOperationException();
+        }
+      };
+    }
+
+    protected abstract int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current);
+
     @Override
     public Query<RowSet<Row>> query(String sql) {
       throw new UnsupportedOperationException();
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolBase.java
@@ -31,6 +31,7 @@
 import io.vertx.sqlclient.impl.pool.SqlConnectionPool;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
 import io.vertx.sqlclient.spi.ConnectionFactory;
+import io.vertx.sqlclient.spi.Driver;
 
 import java.util.List;
 import java.util.function.Function;
@@ -55,14 +56,15 @@ public abstract class PoolBase<P extends Pool> extends SqlClientBase<P> implemen
   private volatile Function<Context, Future<SqlConnection>> connectionProvider;
 
   public PoolBase(VertxInternal vertx,
+                  Driver driver,
                   SqlConnectOptions baseConnectOptions,
                   Supplier<Future<SqlConnectOptions>> connectOptionsProvider,
                   QueryTracer tracer,
                   ClientMetrics metrics,
                   int pipeliningLimit,
                   PoolOptions poolOptions,
                   CloseFuture closeFuture) {
-    super(tracer, metrics);
+    super(driver, tracer, metrics);
 
     this.idleTimeout = MILLISECONDS.convert(poolOptions.getIdleTimeout(), poolOptions.getIdleTimeoutUnit());
     this.connectionTimeout = MILLISECONDS.convert(poolOptions.getConnectionTimeout(), poolOptions.getConnectionTimeoutUnit());
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientBase.java
@@ -36,33 +36,35 @@
 import io.vertx.core.Handler;
 import io.vertx.sqlclient.impl.command.CompositeCommand;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
+import io.vertx.sqlclient.spi.Driver;
 
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collector;
 
 public abstract class SqlClientBase<C extends SqlClient> implements SqlClientInternal, CommandScheduler {
 
+  protected final Driver driver;
   protected final QueryTracer tracer;
   protected final ClientMetrics metrics;
 
-  public SqlClientBase(QueryTracer tracer, ClientMetrics metrics) {
+  public SqlClientBase(Driver driver, QueryTracer tracer, ClientMetrics metrics) {
+    this.driver = driver;
     this.tracer = tracer;
     this.metrics = metrics;
   }
 
-  @Override
-  public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
-    queryBuilder.append("?");
-    return current;
-  }
-
   protected abstract ContextInternal context();
 
   protected abstract <T> PromiseInternal<T> promise();
 
   protected abstract <T> PromiseInternal<T> promise(Handler<AsyncResult<T>> handler);
 
+  @Override
+  public Driver driver() {
+    return driver;
+  }
+
   @Override
   public Query<RowSet<Row>> query(String sql) {
     QueryExecutor<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new QueryExecutor<>(tracer, metrics, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
@@ -184,7 +186,7 @@ private void executeBatch(List<Tuple> batch, PromiseInternal<R> promise) {
 
   @Override
   public void group(Handler<SqlClient> block) {
-    GroupingClient grouping = new GroupingClient(tracer, metrics);
+    GroupingClient grouping = new GroupingClient();
     block.handle(grouping);
     schedule(context(), grouping.composite);
   }
@@ -193,8 +195,8 @@ private class GroupingClient extends SqlClientBase<GroupingClient> {
 
     private CompositeCommand composite = new CompositeCommand();
 
-    public GroupingClient(QueryTracer tracer, ClientMetrics metrics) {
-      super(tracer, metrics);
+    public GroupingClient() {
+      super(SqlClientBase.this.driver, SqlClientBase.this.tracer, SqlClientBase.this.metrics);
     }
 
     @Override
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientInternal.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientInternal.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionBase.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionImpl.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import io.vertx.db2client.DB2ConnectOptions;`
`25`	`25`	`import io.vertx.db2client.DB2Connection;`
`26`	`26`	`import io.vertx.db2client.impl.command.PingCommand;`
	`27`	`+import io.vertx.db2client.spi.DB2Driver;`
`27`	`28`	`import io.vertx.sqlclient.impl.Connection;`
`28`	`29`	`import io.vertx.sqlclient.impl.SqlConnectionImpl;`
`29`	`30`	`import io.vertx.sqlclient.impl.tracing.QueryTracer;`
`@@ -44,7 +45,7 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {`
`47`		`- super(context, factory, conn, tracer, metrics);`
	`48`	`+ super(context, factory, conn, DB2Driver.INSTANCE, tracer, metrics);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,10 @@ public boolean acceptsOptions(SqlConnectOptions options) {`
`62`	`62`	`public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {`
`63`	`63`	`return new MSSQLConnectionFactory((VertxInternal) vertx, MSSQLConnectOptions.wrap(database));`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ @Override`
	`67`	`+ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {`
	`68`	`+ queryBuilder.append('@').append('P').append(1 + index);`
	`69`	`+ return index;`
	`70`	`+ }`
`65`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import io.vertx.mysqlclient.MySQLConnection;`
`23`	`23`	`import io.vertx.mysqlclient.MySQLSetOption;`
`24`	`24`	`import io.vertx.mysqlclient.impl.command.*;`
	`25`	`+import io.vertx.mysqlclient.spi.MySQLDriver;`
`25`	`26`	`import io.vertx.sqlclient.impl.Connection;`
`26`	`27`	`import io.vertx.sqlclient.impl.SqlConnectionImpl;`
`27`	`28`	`import io.vertx.sqlclient.impl.tracing.QueryTracer;`
`@@ -44,7 +45,7 @@ public static Future<MySQLConnection> connect(ContextInternal ctx, MySQLConnectO`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`public MySQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {`
`47`		`- super(context, factory, conn, tracer, metrics);`
	`48`	`+ super(context, factory, conn, MySQLDriver.INSTANCE, tracer, metrics);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`@Override`