Release 2.3.1 (#224)

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 
 publishData {
     useEldoNexusRepos(false)
-    publishingVersion = "2.3.0"
+    publishingVersion = "2.3.1"
 }
 
 group = "de.chojo.sadu"
@@ -122,8 +122,8 @@ allprojects {
 
 
     dependencies {
-        testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0")
-        testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.0")
+        testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.3")
+        testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.3")
         testImplementation("org.mockito", "mockito-core", "5.+")
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

sadu-core/build.gradle.kts

@@ -2,5 +2,5 @@ description = "SADU core module, containing common logic between modules."
 
 dependencies {
     api(libs.slf4j.api)
-    api("org.jetbrains", "annotations", "24.1.0")
+    api("org.jetbrains", "annotations", "26.0.1")
 }

sadu-core/src/main/java/de/chojo/sadu/core/updater/UpdaterBuilder.java

@@ -7,11 +7,9 @@
 package de.chojo.sadu.core.updater;
 
 import de.chojo.sadu.core.jdbc.JdbcConfig;
-import org.jetbrains.annotations.ApiStatus;
 
 import javax.sql.DataSource;
 
-@ApiStatus.Internal
 public interface UpdaterBuilder<T extends JdbcConfig<?>, S extends UpdaterBuilder<T, ?>> {
     /**
      * Set the datasource that should be used

sadu-datasource/build.gradle.kts

@@ -1,7 +1,7 @@
 description = "SADU module to create a hikaricp datasource"
 
 dependencies {
-    api("com.zaxxer", "HikariCP", "5.1.0")
+    api("com.zaxxer", "HikariCP", "6.2.1")
     api(project(":sadu-core"))
 
     testImplementation(project(":sadu-sqlite"))

sadu-examples/build.gradle.kts

@@ -5,8 +5,8 @@ dependencies {
     compileOnly(project(":sadu-postgresql"))
 
     // database driver
-    compileOnly("org.xerial", "sqlite-jdbc", "3.46.1.0")
+    compileOnly("org.xerial", "sqlite-jdbc", "3.47.1.0")
     compileOnly("org.postgresql", "postgresql", "42.7.4")
-    compileOnly("org.mariadb.jdbc", "mariadb-java-client", "3.4.1")
+    compileOnly("org.mariadb.jdbc", "mariadb-java-client", "3.5.1")
     compileOnly("mysql", "mysql-connector-java", "8.0.33")
 }

sadu-queries/src/main/java/de/chojo/sadu/queries/call/CallImpl.java

@@ -15,6 +15,7 @@
 import de.chojo.sadu.queries.call.adapter.StandardAdapter;
 import de.chojo.sadu.queries.calls.BatchCall;
 import de.chojo.sadu.queries.calls.SingletonCall;
+import de.chojo.sadu.queries.exception.Check;
 import de.chojo.sadu.queries.parameter.IndexParameter;
 import de.chojo.sadu.queries.parameter.TokenParameter;
 import de.chojo.sadu.queries.query.TokenizedQuery;
@@ -44,7 +45,7 @@
  * A call is a subelement of a {@link Calls}. It represents a single query call of any kind.
  */
 public final class CallImpl implements Call {
-    private final List<BaseParameter> tokens = new ArrayList<>();
+    private final List<BaseParameter> parameter = new ArrayList<>();
     private int index = 1;
 
     public CallImpl() {
@@ -55,12 +56,12 @@ private int nextIndex() {
     }
 
     private Call addToken(String token, ThrowingBiConsumer<PreparedStatement, Integer, SQLException> apply) {
-        tokens.add(new TokenParameter(token, apply));
+        parameter.add(new TokenParameter(token, apply));
         return this;
     }
 
     private Call addToken(ThrowingBiConsumer<PreparedStatement, Integer, SQLException> apply) {
-        tokens.add(new IndexParameter(nextIndex(), apply));
+        parameter.add(new IndexParameter(nextIndex(), apply));
         return this;
     }
 
@@ -350,9 +351,15 @@ public <T> Call bind(T value, Adapter<T> adapter) {
     }
 
     public void apply(TokenizedQuery query, PreparedStatement stmt) throws SQLException {
-        for (var token : tokens) {
-            token.apply(query, stmt);
+        int indexCount = 0;
+        var tokens = query.getNamedTokens();
+        for (var param : parameter) {
+            param.apply(query, stmt);
+            if (param instanceof IndexParameter) indexCount++;
+            if (param instanceof TokenParameter token) tokens.remove(token.token());
         }
+        Check.assertIndexFilled(indexCount, query);
+        Check.missingToken(tokens, query);
     }
 
     /**

sadu-queries/src/main/java/de/chojo/sadu/queries/exception/Check.java

@@ -7,9 +7,11 @@
 package de.chojo.sadu.queries.exception;
 
 import de.chojo.sadu.mapper.wrapper.Row;
+import de.chojo.sadu.queries.query.TokenizedQuery;
 import org.jetbrains.annotations.Nullable;
 
 import java.sql.ResultSet;
+import java.util.Set;
 
 public final class Check {
     public static void assertQueryResult(@Nullable Object object) {
@@ -20,4 +22,19 @@ public static void assertQueryResult(@Nullable Object object) {
             throw new IllegalQueryReturnTypeException("Result is of type ResultSet. Using a row mapper to map to a ResultSet is forbidden. ResultSets are mutable and are no longer accessible after query execution.");
         }
     }
+
+    public static void assertIndexRange(int index, TokenizedQuery query) {
+        if (query.indexSize() >= index) return;
+        throw new IllegalQueryParameterException("No parameter with index %s exists in query \"%s\". Only %s parameter(s) is/are defined".formatted(index, query.sql(), query.indexSize()));
+    }
+
+    public static void assertIndexFilled(int count, TokenizedQuery query) {
+        if (query.indexSize() == count) return;
+        throw new IllegalQueryParameterException("Missing index parameter. %s were given, but %s were set in query: \"%s\"".formatted(count, query.indexSize(), query.sql()));
+    }
+
+    public static void missingToken(Set<String> tokens, TokenizedQuery query) {
+        if (tokens.isEmpty()) return;
+        throw new IllegalQueryParameterException("The parameters %s are not bound in query: %s".formatted(String.join(", ", tokens), query.sql()));
+    }
 }

sadu-queries/src/main/java/de/chojo/sadu/queries/exception/IllegalQueryParameterException.java

@@ -0,0 +1,13 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
+package de.chojo.sadu.queries.exception;
+
+public class IllegalQueryParameterException extends RuntimeQueryException{
+    public IllegalQueryParameterException(String message) {
+        super(message);
+    }
+}

sadu-queries/src/main/java/de/chojo/sadu/queries/exception/IllegalQueryReturnTypeException.java

@@ -6,7 +6,7 @@
 
 package de.chojo.sadu.queries.exception;
 
-public class IllegalQueryReturnTypeException extends RuntimeException{
+public class IllegalQueryReturnTypeException extends RuntimeQueryException{
     public IllegalQueryReturnTypeException(String message) {
         super(message);
     }

sadu-queries/src/main/java/de/chojo/sadu/queries/exception/QueryException.java

@@ -0,0 +1,49 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
+package de.chojo.sadu.queries.exception;
+
+import de.chojo.sadu.queries.query.ParsedQueryImpl;
+
+import java.io.Serial;
+import java.sql.SQLException;
+
+public class QueryException extends SQLException {
+
+    @Serial
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Cause of the exception
+     */
+    private final SQLException cause;
+
+    /**
+     * Creates a new exception.
+     */
+    public QueryException(ParsedQueryImpl query, SQLException throwable) {
+        super("An error occurred: %s\nWhile executing query:\n%s".formatted(throwable.getMessage(), query.sql().sql().stripIndent()), throwable);
+        cause = throwable;
+    }
+
+    /**
+     * SQL state of the exception
+     *
+     * @return sql state
+     */
+    public String getSQLState() {
+        return cause.getSQLState();
+    }
+
+    /**
+     * Error code of the exception
+     *
+     * @return error code
+     */
+    public int getErrorCode() {
+        return cause.getErrorCode();
+    }
+}

sadu-queries/src/main/java/de/chojo/sadu/queries/exception/RuntimeQueryException.java

@@ -0,0 +1,13 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
+package de.chojo.sadu.queries.exception;
+
+public class RuntimeQueryException extends RuntimeException{
+    public RuntimeQueryException(String message) {
+        super(message);
+    }
+}

sadu-queries/src/main/java/de/chojo/sadu/queries/execution/writing/CalledBatchQueryImpl.java

@@ -15,6 +15,7 @@
 import de.chojo.sadu.queries.api.results.writing.manipulation.ManipulationResult;
 import de.chojo.sadu.queries.call.CallImpl;
 import de.chojo.sadu.queries.calls.BatchCall;
+import de.chojo.sadu.queries.exception.QueryException;
 import de.chojo.sadu.queries.query.ParsedQueryImpl;
 import de.chojo.sadu.queries.query.QueryImpl;
 import de.chojo.sadu.queries.results.writing.insertion.InsertionBatchResultImpl;
@@ -46,7 +47,7 @@ public InsertionBatchResult<InsertionResult> insertAndGetKeys() {
                     var changes = stmt.executeUpdate();
                     changed.add(new InsertionResultImpl(this, changes, Results.generatedKeys(stmt)));
                 } catch (SQLException ex) {
-                    query().handleException(ex);
+                    query().handleException(new QueryException(parsedQuery, ex));
                 }
             }
             return new InsertionBatchResultImpl(this, changed);
@@ -62,7 +63,7 @@ public InsertionBatchResult<InsertionResult> insert() {
                     ((CallImpl) call).apply(parsedQuery.sql(), stmt);
                     changed.add(new InsertionResultImpl(this, stmt.executeUpdate(), Collections.emptyList()));
                 } catch (SQLException ex) {
-                    query().handleException(ex);
+                    query().handleException(new QueryException(parsedQuery, ex));
                 }
             }
             return new InsertionBatchResultImpl(this, changed);
@@ -79,7 +80,7 @@ public ManipulationBatchResult<ManipulationResult> update() {
                     ((CallImpl) call).apply(parsedQuery.sql(), stmt);
                     changed.add(new ManipulationResultImpl(this, stmt.executeUpdate()));
                 } catch (SQLException ex) {
-                    query().handleException(ex);
+                    query().handleException(new QueryException(parsedQuery, ex));
                 }
             }
             return new ManipulationBatchResultImpl<>(this, changed);

sadu-queries/src/main/java/de/chojo/sadu/queries/execution/writing/CalledSingletonQueryImpl.java

@@ -17,6 +17,7 @@
 import de.chojo.sadu.queries.api.results.writing.manipulation.ManipulationResult;
 import de.chojo.sadu.queries.call.CallImpl;
 import de.chojo.sadu.queries.calls.SingletonCall;
+import de.chojo.sadu.queries.exception.QueryException;
 import de.chojo.sadu.queries.execution.reading.AutoMappedQuery;
 import de.chojo.sadu.queries.execution.reading.MappedQuery;
 import de.chojo.sadu.queries.query.ParsedQueryImpl;
@@ -62,7 +63,7 @@ public InsertionResult insert() {
                 ((CallImpl) call.call()).apply(query.sql(), stmt);
                 changed = stmt.executeUpdate();
             } catch (SQLException ex) {
-                query().handleException(ex);
+                query().handleException(new QueryException(query, ex));
             }
             return new InsertionResultImpl(this, changed, Collections.emptyList());
         });
@@ -78,7 +79,7 @@ public InsertionResult insertAndGetKeys() {
                 changed = stmt.executeUpdate();
                 return new InsertionResultImpl(this, changed, Results.generatedKeys(stmt));
             } catch (SQLException ex) {
-                query().handleException(ex);
+                query().handleException(new QueryException(query, ex));
             }
             return InsertionResultImpl.empty(this);
         });
@@ -93,7 +94,7 @@ public ManipulationResult update() {
                 ((CallImpl) call.call()).apply(query.sql(), stmt);
                 changed = stmt.executeUpdate();
             } catch (SQLException ex) {
-                query().handleException(ex);
+                query().handleException(new QueryException(query, ex));
             }
             return new ManipulationResultImpl(this, changed);
         });

sadu-queries/src/main/java/de/chojo/sadu/queries/parameter/IndexParameter.java

@@ -8,6 +8,7 @@
 
 import de.chojo.sadu.core.exceptions.ThrowingBiConsumer;
 import de.chojo.sadu.queries.api.parameter.BaseParameter;
+import de.chojo.sadu.queries.exception.Check;
 import de.chojo.sadu.queries.query.TokenizedQuery;
 
 import java.sql.PreparedStatement;
@@ -24,6 +25,7 @@ public IndexParameter(int index, ThrowingBiConsumer<PreparedStatement, Integer,
 
     @Override
     public void apply(TokenizedQuery query, PreparedStatement stmt) throws SQLException {
+        Check.assertIndexRange(index, query);
         apply.accept(stmt, query.getIndexTokenIndex(index));
     }
 }

sadu-queries/src/main/java/de/chojo/sadu/queries/parameter/TokenParameter.java

@@ -8,10 +8,15 @@
 
 import de.chojo.sadu.core.exceptions.ThrowingBiConsumer;
 import de.chojo.sadu.queries.api.parameter.BaseParameter;
+import de.chojo.sadu.queries.exception.IllegalQueryParameterException;
 import de.chojo.sadu.queries.query.TokenizedQuery;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.List;
+
+import static de.chojo.sadu.queries.query.TokenizedQuery.ALLOWED_TOKEN_CHARACTER;
+import static de.chojo.sadu.queries.query.TokenizedQuery.TOKEN_PATTERN;
 
 public class TokenParameter implements BaseParameter {
     private final String token;
@@ -23,12 +28,23 @@ public TokenParameter(String token, ThrowingBiConsumer<PreparedStatement, Intege
         } else {
             this.token = token;
         }
+        if (!TOKEN_PATTERN.matcher(this.token).matches()) {
+            throw new IllegalArgumentException("Illegal token \"" + this.token.substring(1) + "\". Tokens may only contain characters which match the expression: \"" + ALLOWED_TOKEN_CHARACTER + "\"");
+        }
         this.apply = apply;
     }
 
     public void apply(TokenizedQuery query, PreparedStatement stmt) throws SQLException {
-        for (var index : query.getNamedTokenIndex(token)) {
+        List<Integer> tokens = query.getNamedTokenIndex(token);
+        if (tokens.isEmpty()) {
+            throw new IllegalQueryParameterException("Parameter \"%s\" is bound, but not present in query: \"%s\"".formatted(token, query.sql()));
+        }
+        for (var index : tokens) {
             apply.accept(stmt, index);
         }
     }
+
+    public String token() {
+        return token;
+    }
 }