Isolate prepared statement caching.

abhishekchanda · mp911de · commit 46ddc56531b3 · 2026-01-14T11:11:47.000+01:00
Use PreparedStatement cache per connection and no longer a single cache held at the ConnectionFactory level to avoid mixing prepared statement id's across connections. [#303][resolves #273][resolves #276][resolves #289] Signed-off-by: Abhishek Chanda <acha603@safeway.com>
diff --git a/src/main/java/io/r2dbc/mssql/MssqlConnectionConfiguration.java b/src/main/java/io/r2dbc/mssql/MssqlConnectionConfiguration.java
@@ -24,6 +24,7 @@
 import io.r2dbc.mssql.client.ssl.ExpectedHostnameX509TrustManager;
 import io.r2dbc.mssql.client.ssl.SslConfiguration;
 import io.r2dbc.mssql.client.ssl.TrustAllTrustManager;
+import io.r2dbc.mssql.codec.Codecs;
 import io.r2dbc.mssql.codec.DefaultCodecs;
 import io.r2dbc.mssql.message.tds.Redirect;
 import io.r2dbc.mssql.util.Assert;
@@ -199,8 +200,8 @@ ClientConfiguration toClientConfiguration() {
         );
     }
 
-    ConnectionOptions toConnectionOptions() {
-        return new ConnectionOptions(this.preferCursoredExecution, new DefaultCodecs(), new IndefinitePreparedStatementCache(), this.sendStringParametersAsUnicode);
+    ConnectionOptions toConnectionOptions(Codecs codecs) {
+        return new ConnectionOptions(this.preferCursoredExecution, codecs, new IndefinitePreparedStatementCache(), this.sendStringParametersAsUnicode);
     }
 
     @Override
diff --git a/src/main/java/io/r2dbc/mssql/MssqlConnectionFactory.java b/src/main/java/io/r2dbc/mssql/MssqlConnectionFactory.java
@@ -19,6 +19,7 @@
 import io.r2dbc.mssql.client.Client;
 import io.r2dbc.mssql.client.ClientConfiguration;
 import io.r2dbc.mssql.client.ReactorNettyClient;
+import io.r2dbc.mssql.codec.DefaultCodecs;
 import io.r2dbc.mssql.message.tds.Redirect;
 import io.r2dbc.mssql.util.Assert;
 import io.r2dbc.spi.ConnectionFactory;
@@ -44,7 +45,7 @@ public final class MssqlConnectionFactory implements ConnectionFactory {
 
     private final MssqlConnectionConfiguration configuration;
 
-    private final ConnectionOptions connectionOptions;
+    private final DefaultCodecs codecs = new DefaultCodecs();
 
     /**
      * Creates a new connection factory.
@@ -61,7 +62,6 @@ public MssqlConnectionFactory(MssqlConnectionConfiguration configuration) {
 
         this.clientFactory = Assert.requireNonNull(clientFactory, "clientFactory must not be null");
         this.configuration = Assert.requireNonNull(configuration, "configuration must not be null");
-        this.connectionOptions = configuration.toConnectionOptions();
     }
 
     private static Mono<Client> connect(MssqlConnectionConfiguration configuration) {
@@ -113,10 +113,11 @@ public Mono<MssqlConnection> create() {
         return initializeClient(this.configuration, true)
             .flatMap(it -> {
 
+                ConnectionOptions connectionOptions = this.configuration.toConnectionOptions(this.codecs);
                 Mono<MssqlConnection> connectionMono =
-                    new SimpleMssqlStatement(it, this.connectionOptions, this.METADATA_QUERY).execute()
+                    new SimpleMssqlStatement(it, connectionOptions, this.METADATA_QUERY).execute()
                         .flatMap(result -> result.map((row, rowMetadata) -> toConnectionMetadata(it.getDatabaseVersion().orElse("unknown"), row))).map(metadata -> {
-                        return new MssqlConnection(it, metadata, this.connectionOptions);
+                        return new MssqlConnection(it, metadata, connectionOptions);
                     }).last();
 
                 if (this.configuration.getLockWaitTimeout() != null) {
@@ -142,7 +143,7 @@ ClientConfiguration getClientConfiguration() {
     }
 
     ConnectionOptions getConnectionOptions() {
-        return this.connectionOptions;
+        return this.configuration.toConnectionOptions(this.codecs);
     }
 
     @Override
