Coverage

Author: jeffgbutler

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

@@ -23,14 +23,11 @@
 import org.mybatis.dynamic.sql.util.Buildable;
 
 public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL> {
-    private StandaloneWhereFinisher whereBuilder;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
+    private final StandaloneWhereFinisher whereBuilder = new StandaloneWhereFinisher();
 
     @Override
     public StandaloneWhereFinisher where() {
-        if (whereBuilder == null) {
-            whereBuilder = new StandaloneWhereFinisher();
-        }
         return whereBuilder;
     }
 

src/test/java/org/mybatis/dynamic/sql/where/WhereModelTest.java

@@ -16,6 +16,7 @@
 package org.mybatis.dynamic.sql.where;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.sql.JDBCType;
@@ -24,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.exception.NonRenderingWhereClauseException;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 
@@ -41,4 +43,23 @@ void testThatParameterNameCarriesToSubCriteria() {
             assertThat(wc).isEqualTo("where id = #{myName.parameters.p1,jdbcType=INTEGER} or id = #{myName.parameters.p2,jdbcType=INTEGER}")
         );
     }
+
+    @Test
+    void testNonRenderingWhereDisallowed() {
+        WhereModel model = where().build();
+
+        assertThatExceptionOfType(NonRenderingWhereClauseException.class).isThrownBy(() ->
+                model.render(RenderingStrategies.MYBATIS3)
+        );
+    }
+
+    @Test
+    void testNonRenderingWhereAllowed() {
+        Optional<WhereClauseProvider> whereClause = where()
+                .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+
+        assertThat(whereClause).isEmpty();
+    }
 }