From 512c4cc50774b1695b898d31fc7a73eb8d5ec490 Mon Sep 17 00:00:00 2001
From: "D. Can Celasun" <can@dcc.im>
Date: Tue, 11 Jul 2023 08:54:17 +0100
Subject: [PATCH 1/2] Support MariaDB JDBC driver

This fixes #1113
---
 commafeed-server/config.yml.example | 4 ++++
 commafeed-server/pom.xml            | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/commafeed-server/config.yml.example b/commafeed-server/config.yml.example
index e521a939..298c02f7 100644
--- a/commafeed-server/config.yml.example
+++ b/commafeed-server/config.yml.example
@@ -82,6 +82,10 @@ app:
 
 # Database connection
 # -------------------
+# for MariaDB
+# driverClass is org.mariadb.jdbc.Driver
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+#
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
 # url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml
index 49539783..16feeeee 100644
--- a/commafeed-server/pom.xml
+++ b/commafeed-server/pom.xml
@@ -444,6 +444,11 @@
 			<artifactId>mysql-connector-j</artifactId>
 			<version>8.0.33</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>3.1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
@@ -494,4 +499,4 @@
 		</dependency>
 
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

From 1f4ec412224cb569f5746e2e79076f134524af2d Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 12 Jul 2023 15:03:30 +0200
Subject: [PATCH 2/2] change other yml files

---
 commafeed-server/config.dev.yml                     | 4 ++++
 commafeed-server/src/test/resources/config.test.yml | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/commafeed-server/config.dev.yml b/commafeed-server/config.dev.yml
index ac585db3..a27ed025 100644
--- a/commafeed-server/config.dev.yml
+++ b/commafeed-server/config.dev.yml
@@ -81,6 +81,10 @@ app:
 
 # Database connection
 # -------------------  
+# for MariaDB
+# driverClass is org.mariadb.jdbc.Driver
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+#
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
 # url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
diff --git a/commafeed-server/src/test/resources/config.test.yml b/commafeed-server/src/test/resources/config.test.yml
index 66e458c7..2d880cde 100644
--- a/commafeed-server/src/test/resources/config.test.yml
+++ b/commafeed-server/src/test/resources/config.test.yml
@@ -80,7 +80,11 @@ app:
   userAgent:
 
 # Database connection
-# -------------------  
+# -------------------
+# for MariaDB
+# driverClass is org.mariadb.jdbc.Driver
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+#
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
 # url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true