Merge branch 'master' into reusable-where-clauses-v2

Author: jeffgbutler

pom.xml

@@ -68,7 +68,7 @@
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
 
     <kotlin.code.style>official</kotlin.code.style>
-    <test.containers.version>1.17.5</test.containers.version>
+    <test.containers.version>1.17.6</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
 
     <!-- Reproducible Builds -->
@@ -218,7 +218,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.3.23</version>
+      <version>5.3.24</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

src/main/java/org/mybatis/dynamic/sql/common/AbstractBooleanExpressionDSL.java

@@ -28,9 +28,11 @@
 import org.mybatis.dynamic.sql.ExistsPredicate;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.VisitableCondition;
+import org.mybatis.dynamic.sql.exception.InvalidSqlException;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public abstract class AbstractBooleanExpressionDSL<T extends AbstractBooleanExpressionDSL<T>> {
-    protected SqlCriterion initialCriterion; // WARNING - may be null!
+    private SqlCriterion initialCriterion; // WARNING - may be null!
     protected final List<AndOrCriteriaGroup> subCriteria = new ArrayList<>();
 
     @NotNull
@@ -143,5 +145,18 @@ private void addSubCriteria(String connector, List<AndOrCriteriaGroup> criteria)
                 .build());
     }
 
+    protected void setInitialCriterion(SqlCriterion initialCriterion) {
+        if (this.initialCriterion != null) {
+            throw new InvalidSqlException(Messages.getString("ERROR.32")); //$NON-NLS-1$
+        }
+
+        this.initialCriterion = initialCriterion;
+    }
+
+    // may be null!
+    protected SqlCriterion getInitialCriterion() {
+        return initialCriterion;
+    }
+
     protected abstract T getThis();
 }

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

@@ -602,7 +602,7 @@ public FromGatherer<R> selectDistinct(List<BasicColumn> selectList) {
     public class QueryExpressionHavingBuilder extends AbstractBooleanExpressionDSL<QueryExpressionHavingBuilder> implements Buildable<R> {
 
         public QueryExpressionHavingBuilder(SqlCriterion initialCriterion) {
-            this.initialCriterion = initialCriterion;
+            setInitialCriterion(initialCriterion);
         }
 
         public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
@@ -645,7 +645,7 @@ protected QueryExpressionHavingBuilder getThis() {
         }
 
         protected HavingModel buildHavingModel() {
-            return new HavingModel(initialCriterion, subCriteria);
+            return new HavingModel(getInitialCriterion(), subCriteria);
         }
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

@@ -56,10 +56,10 @@ public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition,
     @NotNull
     public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition,
                        List<AndOrCriteriaGroup> subCriteria) {
-        initialCriterion = ColumnAndConditionCriterion.withColumn(column)
+        setInitialCriterion(ColumnAndConditionCriterion.withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(subCriteria)
-                .build();
+                .build());
         return getThis();
     }
 
@@ -70,8 +70,8 @@ public T where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteri
 
     @NotNull
     public T where(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCriteria) {
-        initialCriterion = new ExistsCriterion.Builder()
-                .withExistsPredicate(existsPredicate).withSubCriteria(subCriteria).build();
+        setInitialCriterion(new ExistsCriterion.Builder()
+                .withExistsPredicate(existsPredicate).withSubCriteria(subCriteria).build());
         return getThis();
     }
 
@@ -82,18 +82,18 @@ public T where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria)
 
     @NotNull
     public T where(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCriteria) {
-        this.initialCriterion = new CriteriaGroup.Builder()
+        setInitialCriterion(new CriteriaGroup.Builder()
                 .withInitialCriterion(initialCriterion)
                 .withSubCriteria(subCriteria)
-                .build();
+                .build());
         return getThis();
     }
 
     @NotNull
     public T where(List<AndOrCriteriaGroup> criteria) {
-        initialCriterion = new CriteriaGroup.Builder()
+        setInitialCriterion(new CriteriaGroup.Builder()
                 .withSubCriteria(criteria)
-                .build();
+                .build());
         return getThis();
     }
 
@@ -104,7 +104,7 @@ public T applyWhere(WhereApplier whereApplier) {
     }
 
     protected WhereModel internalBuild() {
-        return new WhereModel(initialCriterion, subCriteria, statementConfiguration);
+        return new WhereModel(getInitialCriterion(), subCriteria, statementConfiguration);
     }
 
     protected abstract T getThis();

src/main/resources/org/mybatis/dynamic/sql/util/messages.properties

@@ -47,4 +47,5 @@ ERROR.28=You must specify a select statement in a sub query
 ERROR.29=Insert Select Statements Must Contain an "into" phrase
 ERROR.30=The parameters for insertMultipleWithGeneratedKeys must contain exactly one parameter of type String
 ERROR.31=You cannot specify more than one "having" clause in a query expression
+ERROR.32=You cannot specify more than one "where" clause in a statement
 INTERNAL.ERROR=Internal Error {0}

src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java

@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mybatis.dynamic.sql.SqlBuilder.insert;
 import static org.mybatis.dynamic.sql.SqlBuilder.insertInto;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 import static org.mybatis.dynamic.sql.SqlBuilder.update;
 
 import java.util.ArrayList;
@@ -43,6 +44,7 @@
 import org.mybatis.dynamic.sql.select.join.JoinSpecification;
 import org.mybatis.dynamic.sql.select.join.JoinType;
 import org.mybatis.dynamic.sql.select.render.PagingModelRenderer;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.util.Messages;
 
@@ -244,6 +246,19 @@ void testInvalidPagingModel() {
                 .withMessage(Messages.getInternalErrorString(13));
     }
 
+
+    @Test
+    void testInvalidMultipleWhereClauses() {
+        UpdateDSL<UpdateModel>.UpdateWhereBuilder builder = update(person)
+                .set(id).equalTo(3)
+                .where(id, isEqualTo(2));
+
+        assertThatExceptionOfType(InvalidSqlException.class)
+                .isThrownBy(() -> builder.where(id, isEqualTo(5)))
+                .withMessage(Messages.getString("ERROR.32"));
+
+    }
+
     static class TestRow {
         private Integer id;