Release 2.2.4 (#206)

rainbowdashlabs · Aug 16, 2024 · d296dac · d296dac
2 parents 00b53c8 + c47975e
commit d296dac
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
 
 publishData {
     useEldoNexusRepos(false)
-    publishingVersion = "2.2.3"
+    publishingVersion = "2.2.4"
 }
 
 group = "de.chojo.sadu"

diff --git a/sadu-examples/build.gradle.kts b/sadu-examples/build.gradle.kts
@@ -7,6 +7,6 @@ dependencies {
     // database driver
     compileOnly("org.xerial", "sqlite-jdbc", "3.46.0.1")
     compileOnly("org.postgresql", "postgresql", "42.7.3")
-    compileOnly("org.mariadb.jdbc", "mariadb-java-client", "3.4.0")
+    compileOnly("org.mariadb.jdbc", "mariadb-java-client", "3.4.1")
     compileOnly("mysql", "mysql-connector-java", "8.0.33")
 }
diff --git a/sadu-queries/src/main/java/de/chojo/sadu/queries/api/configuration/QueryConfiguration.java b/sadu-queries/src/main/java/de/chojo/sadu/queries/api/configuration/QueryConfiguration.java
@@ -7,18 +7,20 @@
 package de.chojo.sadu.queries.api.configuration;
 
 import de.chojo.sadu.mapper.RowMapperRegistry;
+import de.chojo.sadu.queries.api.configuration.context.QueryContext;
 import de.chojo.sadu.queries.api.query.ParsedQuery;
 import de.chojo.sadu.queries.configuration.ConnectedQueryConfigurationImpl;
 import de.chojo.sadu.queries.configuration.QueryConfigurationBuilder;
-import de.chojo.sadu.queries.api.configuration.context.QueryContext;
 import org.intellij.lang.annotations.Language;
 
 import javax.sql.DataSource;
+import java.sql.SQLException;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 
 @SuppressWarnings("removal")
-public interface QueryConfiguration extends de.chojo.sadu.queries.configuration.QueryConfiguration{
+public interface QueryConfiguration extends de.chojo.sadu.queries.configuration.QueryConfiguration {
     AtomicReference<QueryConfiguration> DEFAULT = new AtomicReference<>(null);
 
     /**
@@ -39,6 +41,29 @@ static void setDefault(QueryConfiguration configuration) {
         DEFAULT.set(configuration);
     }
 
+    /**
+     * Returns a builder with the defaults being the settings of this config
+     *
+     * @param source Overrides the current data source
+     * @return new builder instance
+     */
+    default QueryConfigurationBuilder edit(DataSource source) {
+        return builder(source)
+                .setAtomic(atomic())
+                .setExceptionHandler(exceptionHandler())
+                .setRowMapperRegistry(rowMapperRegistry())
+                .setThrowExceptions(throwExceptions());
+    }
+
+    /**
+     * Returns a builder with the defaults being the settings of this config
+     *
+     * @return new builder instance
+     */
+    default QueryConfigurationBuilder edit() {
+        return edit(dataSource());
+    }
+
     /**
      * Creates a new QueryConfigurationBuilder instance with the given DataSource.
      *
@@ -85,6 +110,13 @@ static QueryConfigurationBuilder builder(DataSource source) {
      */
     DataSource dataSource();
 
+    /**
+     * Retrieves the exception handler
+     *
+     * @return exception handler
+     */
+    Consumer<SQLException> exceptionHandler();
+
     /**
      * Executes a SQL query with the given SQL statement and format arguments.
      *

diff --git a/...in/java/de/chojo/sadu/queries/configuration/ConnectedQueryQueryConfigurationDelegate.java b/...in/java/de/chojo/sadu/queries/configuration/ConnectedQueryQueryConfigurationDelegate.java
@@ -14,6 +14,7 @@
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.function.Consumer;
 
 public class ConnectedQueryQueryConfigurationDelegate implements ConnectedQueryConfiguration {
     private final ConnectedQueryConfigurationImpl configuration;
@@ -47,6 +48,11 @@ public DataSource dataSource() {
         return configuration.dataSource();
     }
 
+    @Override
+    public Consumer<SQLException> exceptionHandler() {
+        return configuration.exceptionHandler();
+    }
+
     @Override
     public RowMapperRegistry rowMapperRegistry() {
         return configuration.rowMapperRegistry();

diff --git a/sadu-queries/src/main/java/de/chojo/sadu/queries/configuration/QueryConfiguration.java b/sadu-queries/src/main/java/de/chojo/sadu/queries/configuration/QueryConfiguration.java
@@ -8,8 +8,8 @@
 
 import de.chojo.sadu.mapper.RowMapperRegistry;
 import de.chojo.sadu.queries.api.configuration.ActiveQueryConfiguration;
-import de.chojo.sadu.queries.api.query.ParsedQuery;
 import de.chojo.sadu.queries.api.configuration.context.QueryContext;
+import de.chojo.sadu.queries.api.query.ParsedQuery;
 import org.intellij.lang.annotations.Language;
 
 import javax.sql.DataSource;

diff --git a/sadu-queries/src/main/java/de/chojo/sadu/queries/configuration/QueryConfigurationImpl.java b/sadu-queries/src/main/java/de/chojo/sadu/queries/configuration/QueryConfigurationImpl.java
@@ -60,6 +60,11 @@ public DataSource dataSource() {
         return dataSource;
     }
 
+    @Override
+    public Consumer<SQLException> exceptionHandler() {
+        return exceptionHandler;
+    }
+
     @Override
     public ParsedQuery query(@Language("sql") String sql, Object... format) {
         return Query.query(this, sql, format);

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -41,12 +41,12 @@ dependencyResolutionManagement {
             plugin("indra-publishing", "net.kyori.indra.publishing").versionRef("indra")
             plugin("indra-sonatype", "net.kyori.indra.publishing.sonatype").versionRef("indra")
 
-            version("slf4j", "2.0.13")
+            version("slf4j", "2.0.16")
             library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
         }
 
         create("testlibs") {
-            version("junit", "5.10.3")
+            version("junit", "5.11.0")
             library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("junit")
             library("junit-params", "org.junit.jupiter", "junit-jupiter-params").versionRef("junit")
             bundle("junit", listOf("junit-jupiter", "junit-params"))
@@ -58,11 +58,11 @@ dependencyResolutionManagement {
             library("testcontainers-core", "org.testcontainers", "testcontainers").versionRef("testcontainers")
             library("testcontainers-junit", "org.testcontainers", "junit-jupiter").versionRef("testcontainers")
 
-            version("slf4j", "2.0.13")
+            version("slf4j", "2.0.16")
             library("slf4j-noop", "org.slf4j", "slf4j-nop").versionRef("slf4j")
 
             library("driver-postgres", "org.postgresql:postgresql:42.7.3")
-            library("driver-mariadb", "org.mariadb.jdbc:mariadb-java-client:3.4.0")
+            library("driver-mariadb", "org.mariadb.jdbc:mariadb-java-client:3.4.1")
             library("driver-sqlite", "org.xerial:sqlite-jdbc:3.46.0.1")
             library("driver-mysql", "com.mysql:mysql-connector-j:9.0.0")