Polishing.

mp911de · mp911de · commit c0393cfa5e56 · 2026-01-14T11:11:47.000+01:00
Add test, remove duplications. [resolves #303][#273][#276][#289] Signed-off-by: Mark Paluch <mpaluch@paluch.biz>
diff --git a/src/main/java/io/r2dbc/mssql/MssqlConnectionFactory.java b/src/main/java/io/r2dbc/mssql/MssqlConnectionFactory.java
@@ -113,7 +113,7 @@ public Mono<MssqlConnection> create() {
         return initializeClient(this.configuration, true)
             .flatMap(it -> {
 
-                ConnectionOptions connectionOptions = this.configuration.toConnectionOptions(this.codecs);
+                ConnectionOptions connectionOptions = getConnectionOptions();
                 Mono<MssqlConnection> connectionMono =
                     new SimpleMssqlStatement(it, connectionOptions, this.METADATA_QUERY).execute()
                         .flatMap(result -> result.map((row, rowMetadata) -> toConnectionMetadata(it.getDatabaseVersion().orElse("unknown"), row))).map(metadata -> {
diff --git a/src/test/java/io/r2dbc/mssql/MssqlConnectionFactoryUnitTests.java b/src/test/java/io/r2dbc/mssql/MssqlConnectionFactoryUnitTests.java
@@ -20,14 +20,7 @@
 import io.r2dbc.mssql.message.tds.Encode;
 import io.r2dbc.mssql.message.tds.Redirect;
 import io.r2dbc.mssql.message.tds.ServerCharset;
-import io.r2dbc.mssql.message.token.Column;
-import io.r2dbc.mssql.message.token.ColumnMetadataToken;
-import io.r2dbc.mssql.message.token.DoneToken;
-import io.r2dbc.mssql.message.token.ErrorToken;
-import io.r2dbc.mssql.message.token.Prelogin;
-import io.r2dbc.mssql.message.token.RowToken;
-import io.r2dbc.mssql.message.token.RowTokenFactory;
-import io.r2dbc.mssql.message.token.SqlBatch;
+import io.r2dbc.mssql.message.token.*;
 import io.r2dbc.mssql.message.type.LengthStrategy;
 import io.r2dbc.mssql.message.type.SqlServerType;
 import io.r2dbc.mssql.message.type.TypeInformation;
@@ -171,6 +164,19 @@ void shouldFailOnMultipleRedirects() {
         assertThat(redirect.isClosed()).isTrue();
     }
 
+    @Test
+    void shouldCreateNewPreparedStatement() {
+
+        MssqlConnectionFactory connectionFactory = new MssqlConnectionFactory(config -> Mono.empty(), this.configuration);
+        ConnectionOptions options = connectionFactory.getConnectionOptions();
+        ConnectionOptions other = connectionFactory.getConnectionOptions();
+
+        options.getPreparedStatementCache().putHandle(1, "foo", new Binding());
+
+        assertThat(options.getPreparedStatementCache().getHandle("foo", new Binding())).isEqualTo(1);
+        assertThat(other.getPreparedStatementCache().getHandle("foo", new Binding())).isEqualTo(0);
+    }
+
     private static Column createColumn(int index, String name, SqlServerType serverType, int length, LengthStrategy lengthStrategy, @Nullable Charset charset) {
 
         TypeInformation.Builder builder = TypeInformation.builder().withServerType(serverType).withMaxLength(length).withLengthStrategy(lengthStrategy);
