From b849effaf9a77f0bf7fd8beac42d6a0ac9e358c2 Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Thu, 2 Nov 2023 10:01:05 -0400
Subject: [PATCH] DBZ-7085 Add MariaDB and use it with MariaDB profile

---
 debezium-bom/pom.xml                          |  7 ++++++
 debezium-connector-mysql/pom.xml              | 25 +++++++++++++++++++
 .../connector/mysql/UniqueDatabase.java       |  4 +++
 pom.xml                                       |  1 +
 4 files changed, 37 insertions(+)

diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml
index cf9b5a829..d878ac962 100644
--- a/debezium-bom/pom.xml
+++ b/debezium-bom/pom.xml
@@ -200,6 +200,13 @@
                 <version>1.0.2</version>
             </dependency>
 
+            <!-- MariaDB JDBC driver -->
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${version.mariadb.driver}</version>
+            </dependency>
+
             <!-- MongoDB Java driver -->
             <dependency>
                 <groupId>org.mongodb</groupId>
diff --git a/debezium-connector-mysql/pom.xml b/debezium-connector-mysql/pom.xml
index f0db29b89..5c902d3d5 100644
--- a/debezium-connector-mysql/pom.xml
+++ b/debezium-connector-mysql/pom.xml
@@ -57,6 +57,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+        </dependency>
 
         <!-- Testing -->
         <dependency>
@@ -172,6 +176,8 @@
         <mysql.init.timeout>60000</mysql.init.timeout> <!-- 60 seconds -->
         <apicurio.port>8080</apicurio.port>
         <apicurio.init.timeout>60000</apicurio.init.timeout> <!-- 60 seconds -->
+        <mysql.database.protocol>jdbc:mysql</mysql.database.protocol>
+        <mysql.database.jdbc.driver>com.mysql.cj.jdbc.Driver</mysql.database.jdbc.driver>
         <!--
         MariaDB specific
         -->
@@ -541,6 +547,9 @@
                         <database.password>${mysql.password}</database.password>
                         <database.replica.hostname>${docker.host.address}</database.replica.hostname>
                         <database.replica.port>${mysql.replica.port}</database.replica.port>
+                        <!-- Specifies which driver to use for the tests -->
+                        <database.protocol>${mysql.database.protocol}</database.protocol>
+                        <database.jdbc.driver>${mysql.database.jdbc.driver}</database.jdbc.driver>
                         <skipLongRunningTests>${skipLongRunningTests}</skipLongRunningTests>
                         <database.ssl.mode>disabled</database.ssl.mode>
                     </systemPropertyVariables>
@@ -686,6 +695,9 @@
                                 <database.port>${mysql.port}</database.port>
                                 <database.replica.port>${mysql.port}</database.replica.port>
                                 <database.ssl.mode>disabled</database.ssl.mode>
+                                <!-- Specifies which driver to use for the tests -->
+                                <database.protocol>${mysql.database.protocol}</database.protocol>
+                                <database.jdbc.driver>${mysql.database.jdbc.driver}</database.jdbc.driver>
                                 <skipLongRunningTests>false</skipLongRunningTests>
                                 <isAssemblyProfileActive>true</isAssemblyProfileActive>
                             </systemPropertyVariables>
@@ -703,6 +715,9 @@
                                         <!-- same port for both, since we're only running one server -->
                                         <database.port>${mysql.port}</database.port>
                                         <database.replica.port>${mysql.port}</database.replica.port>
+                                        <!-- Specifies which driver to use for the tests -->
+                                        <database.protocol>${mysql.database.protocol}</database.protocol>
+                                        <database.jdbc.driver>${mysql.database.jdbc.driver}</database.jdbc.driver>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>
@@ -716,6 +731,9 @@
                                     <systemPropertyVariables>
                                         <database.port>${mysql.gtid.port}</database.port>
                                         <database.replica.port>${mysql.gtid.replica.port}</database.replica.port>
+                                        <!-- Specifies which driver to use for the tests -->
+                                        <database.protocol>${mysql.database.protocol}</database.protocol>
+                                        <database.jdbc.driver>${mysql.database.jdbc.driver}</database.jdbc.driver>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>
@@ -749,6 +767,9 @@
                                         <!-- same port for both, since we're only running one server -->
                                         <database.port>${mysql.ssl.port}</database.port>
                                         <database.replica.port>${mysql.ssl.port}</database.replica.port>
+                                        <!-- Specifies which driver to use for the tests -->
+                                        <database.protocol>${mysql.database.protocol}</database.protocol>
+                                        <database.jdbc.driver>${mysql.database.jdbc.driver}</database.jdbc.driver>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>
@@ -914,6 +935,8 @@
                 <docker.dbs>debezium/mysql-server-test-database</docker.dbs>
                 <mysql.server.image.source>${mariadb.server.image.source}</mysql.server.image.source>
                 <version.mysql.server>${version.mariadb.server}</version.mysql.server>
+                <mysql.database.protocol>jdbc:mariadb</mysql.database.protocol>
+                <mysql.database.jdbc.driver>org.mariadb.jdbc.Driver</mysql.database.jdbc.driver>
             </properties>
         </profile>
         <!-- Profile for MariaDB SQL support -->
@@ -926,6 +949,8 @@
                 <docker.dbs>debezium/mysql-server-test-database-ssl</docker.dbs>
                 <mysql.server.image.source>${mariadb.server.image.source}</mysql.server.image.source>
                 <version.mysql.server>${version.mariadb.server}</version.mysql.server>
+                <mysql.database.protocol>jdbc:mariadb</mysql.database.protocol>
+                <mysql.database.jdbc.driver>org.mariadb.jdbc.Driver</mysql.database.jdbc.driver>
             </properties>
         </profile>
     </profiles>
diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/UniqueDatabase.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/UniqueDatabase.java
index d5923784a..e633db5f0 100644
--- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/UniqueDatabase.java
+++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/UniqueDatabase.java
@@ -193,6 +193,10 @@ public Configuration.Builder defaultJdbcConfigBuilder() {
         Builder builder = Configuration.create()
                 .with(MySqlConnectorConfig.HOSTNAME, System.getProperty("database.hostname", "localhost"))
                 .with(MySqlConnectorConfig.PORT, System.getProperty("database.port", "3306"))
+                .with(MySqlConnectorConfig.JDBC_PROTOCOL, System.getProperty("database.protocol",
+                        MySqlConnectorConfig.JDBC_PROTOCOL.defaultValueAsString()))
+                .with(MySqlConnectorConfig.JDBC_DRIVER, System.getProperty("database.jdbc.driver",
+                        MySqlConnectorConfig.JDBC_DRIVER.defaultValueAsString()))
                 .with(MySqlConnectorConfig.USER, "snapper")
                 .with(MySqlConnectorConfig.PASSWORD, "snapperpass");
 
diff --git a/pom.xml b/pom.xml
index d71c62c70..17643e888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
         <version.informix.changestream.client>1.1.3</version.informix.changestream.client>
         <version.informix.driver>4.50.10</version.informix.driver>
         <version.cassandra.driver>4.14.0</version.cassandra.driver>
+        <version.mariadb.driver>3.2.0</version.mariadb.driver>
 
         <!-- Databases, should align with database drivers -->
         <version.mysql.server>8.2</version.mysql.server>