fix(mysql): normalize legacy MariaDB URLs

Author: subrata71

app/server/appsmith-plugins/mysqlPlugin/pom.xml

@@ -87,11 +87,6 @@
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-pool</artifactId>
-            <!--
-                Please be careful when upgrading package version from 0.8.x to 0.9.x or higher since 0.9.x version
-                seems incompatible with r2dbc-mysql version 0.8.2.RELEASE because 0.9.x version contains a higher
-                version of one of the dependent packages (not able to remember the name of the package at the moment)
-            -->
             <version>0.8.8.RELEASE</version>
             <exclusions>
                 <exclusion>

app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/utils/MySqlDatasourceUtils.java

@@ -40,6 +40,9 @@ public class MySqlDatasourceUtils {
 
     public static int MAX_CONNECTION_POOL_SIZE = 20;
 
+    private static final String MARIADB_URL_PREFIX = "r2dbc:mariadb://";
+    private static final String LEGACY_MARIADB_POOL_URL_PREFIX = "r2dbc:pool:mariadb://";
+
     /**
      * 1 sec is the recommended value as shown in the example here:
      * https://mariadb.com/docs/xpand/connect/programming-languages/java-r2dbc/native/connection-pools/
@@ -77,7 +80,7 @@ public static ConnectionFactoryOptions.Builder getBuilder(
         if (isEmpty(datasourceConfiguration.getEndpoints())) {
             urlBuilder.append(datasourceConfiguration.getUrl());
         } else {
-            urlBuilder.append("r2dbc:mariadb://");
+            urlBuilder.append(MARIADB_URL_PREFIX);
             final List<String> hosts = new ArrayList<>();
 
             if (!isSSHEnabled(datasourceConfiguration, CONNECTION_METHOD_INDEX)) {
@@ -111,7 +114,12 @@ public static ConnectionFactoryOptions.Builder getBuilder(
             }
         }
 
-        ConnectionFactoryOptions baseOptions = ConnectionFactoryOptions.parse(urlBuilder.toString());
+        String connectionUrl = urlBuilder.toString();
+        if (connectionUrl.startsWith(LEGACY_MARIADB_POOL_URL_PREFIX)) {
+            connectionUrl = MARIADB_URL_PREFIX + connectionUrl.substring(LEGACY_MARIADB_POOL_URL_PREFIX.length());
+        }
+
+        ConnectionFactoryOptions baseOptions = ConnectionFactoryOptions.parse(connectionUrl);
         ConnectionFactoryOptions.Builder ob = ConnectionFactoryOptions.builder()
                 .from(baseOptions)
                 .option(ConnectionFactoryOptions.USER, authentication.getUsername())

app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySQLDatasourceValidationTest.java

@@ -15,6 +15,7 @@
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.jupiter.api.Test;
 import org.mariadb.r2dbc.MariadbConnectionConfiguration;
+import org.mariadb.r2dbc.util.HostAddress;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -208,6 +209,37 @@ public void testStandardConnectionOptionsAreCompatibleWithMariaDbDriver() {
                 () -> MariadbConnectionConfiguration.fromOptions(options).build());
     }
 
+    @Test
+    public void testStoredPoolUrlIsCompatibleWithMariaDbDriver() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        dsConfig.setEndpoints(List.of());
+        dsConfig.setUrl("r2dbc:pool:mariadb://mysqlHost:3306/dbname");
+        ConnectionFactoryOptions options =
+                MySqlDatasourceUtils.getBuilder(dsConfig, null).build();
+
+        MariadbConnectionConfiguration configuration = assertDoesNotThrow(
+                () -> MariadbConnectionConfiguration.fromOptions(options).build());
+        assertEquals("mariadb", options.getValue(DRIVER));
+        assertNull(options.getValue(PROTOCOL));
+        assertEquals(List.of(new HostAddress("mysqlHost", 3306)), configuration.getHostAddresses());
+    }
+
+    @Test
+    public void testMultipleEndpointsAreCompatibleWithMariaDbDriver() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        dsConfig.setEndpoints(List.of(new Endpoint("primaryHost", 3306L), new Endpoint("replicaHost", 3307L)));
+        ConnectionFactoryOptions options =
+                MySqlDatasourceUtils.getBuilder(dsConfig, null).build();
+
+        MariadbConnectionConfiguration configuration = assertDoesNotThrow(
+                () -> MariadbConnectionConfiguration.fromOptions(options).build());
+        assertEquals("mariadb", options.getValue(DRIVER));
+        assertNull(options.getValue(PROTOCOL));
+        assertEquals(
+                List.of(new HostAddress("primaryHost", 3306), new HostAddress("replicaHost", 3307)),
+                configuration.getHostAddresses());
+    }
+
     @Test
     public void testSslToggleMissingError() {
         DatasourceConfiguration datasourceConfiguration = getDatasourceConfigurationWithStandardConnectionMethod();