From b0c3802ab13e1a524200ddb8a347896f8c3b10c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 12:42:40 -0600
Subject: [PATCH] Add MSSQLR2DBCDatabaseContainer compatible with
 org.testcontainers.mssqlserver.MSSQLServerContainer

---
 .../MSSQLR2DBCDatabaseContainer.java          | 59 +++++++++++++++++++
 .../MSSQLR2DBCDatabaseContainerTest.java      | 23 ++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java

diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..d8d7740e01d
--- /dev/null
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
@@ -0,0 +1,59 @@
+package org.testcontainers.mssqlserver;
+
+import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+import java.util.Set;
+
+public class MSSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final MSSQLServerContainer container;
+
+    public MSSQLR2DBCDatabaseContainer(MSSQLServerContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(MSSQLServerContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, MssqlConnectionFactoryProvider.MSSQL_DRIVER)
+            .build();
+
+        return new MSSQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT))
+            // TODO enable if/when MSSQLServerContainer adds support for customizing the DB name
+            // .option(ConnectionFactoryOptions.DATABASE, container.getDatabasseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..7b51e8f1f93
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.mssqlserver;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.MSSQLServerTestImages;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+class MSSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MSSQLServerContainer> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MSSQLServerContainer container) {
+        return MSSQLR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2022-CU14-ubuntu-22.04";
+    }
+
+    @Override
+    protected MSSQLServerContainer createContainer() {
+        return new MSSQLServerContainer(MSSQLServerTestImages.MSSQL_SERVER_IMAGE);
+    }
+}