Implement embedded where clauses

jeffgbutler · jeffgbutler · commit f385ba487071 · 2024-03-25T12:31:09.000-04:00
This separate the concept of a standalone where clause from a where clause that is a part of another statetment.
diff --git a/src/main/java/org/mybatis/dynamic/sql/common/CommonBuilder.java b/src/main/java/org/mybatis/dynamic/sql/common/CommonBuilder.java
@@ -17,7 +17,7 @@
 
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 /**
  * Builder class shared between the delete and update model builders.
@@ -27,7 +27,7 @@
 public abstract class CommonBuilder<T extends CommonBuilder<T>> {
     private SqlTable table;
     private String tableAlias;
-    private WhereModel whereModel;
+    private EmbeddedWhereModel whereModel;
     private Long limit;
     private OrderByModel orderByModel;
     private StatementConfiguration statementConfiguration;
@@ -40,7 +40,7 @@ public String tableAlias() {
         return tableAlias;
     }
 
-    public WhereModel whereModel() {
+    public EmbeddedWhereModel whereModel() {
         return whereModel;
     }
 
@@ -66,7 +66,7 @@ public T withTableAlias(String tableAlias) {
         return getThis();
     }
 
-    public T withWhereModel(WhereModel whereModel) {
+    public T withWhereModel(EmbeddedWhereModel whereModel) {
         this.whereModel = whereModel;
         return getThis();
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java
@@ -30,7 +30,7 @@
 import org.mybatis.dynamic.sql.util.Utilities;
 import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
 import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class DeleteDSL<R> extends AbstractWhereStarter<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>
         implements Buildable<R> {
@@ -111,7 +111,7 @@ public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlia
     public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder> implements Buildable<R> {
 
         private DeleteWhereBuilder() {
-            super(statementConfiguration);
+            super(DeleteDSL.this);
         }
 
         public DeleteDSL<R> limit(long limit) {
@@ -138,7 +138,7 @@ protected DeleteWhereBuilder getThis() {
             return this;
         }
 
-        protected WhereModel buildWhereModel() {
+        protected EmbeddedWhereModel buildWhereModel() {
             return buildModel();
         }
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java
@@ -26,12 +26,12 @@
 import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class DeleteModel {
     private final SqlTable table;
     private final String tableAlias;
-    private final WhereModel whereModel;
+    private final EmbeddedWhereModel whereModel;
     private final Long limit;
     private final OrderByModel orderByModel;
     private final StatementConfiguration statementConfiguration;
@@ -53,7 +53,7 @@ public Optional<String> tableAlias() {
         return Optional.ofNullable(tableAlias);
     }
 
-    public Optional<WhereModel> whereModel() {
+    public Optional<EmbeddedWhereModel> whereModel() {
         return Optional.ofNullable(whereModel);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java b/src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java
@@ -30,7 +30,7 @@
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class DeleteRenderer {
     private final DeleteModel deleteModel;
@@ -75,7 +75,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
         return deleteModel.whereModel().flatMap(this::renderWhereClause);
     }
 
-    private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
+    private Optional<FragmentAndParameters> renderWhereClause(EmbeddedWhereModel whereModel) {
         return whereModel.render(renderingContext);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java
@@ -27,7 +27,7 @@
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.Utilities;
 import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 /**
  * DSL for building count queries. Count queries are specializations of select queries. They have joins and where
@@ -131,7 +131,7 @@ public CountDSL<R> from(SqlTable table) {
     public class CountWhereBuilder extends AbstractWhereFinisher<CountWhereBuilder>
             implements Buildable<R> {
         private CountWhereBuilder() {
-            super(statementConfiguration);
+            super(CountDSL.this);
         }
 
         @NotNull
@@ -145,7 +145,7 @@ protected CountWhereBuilder getThis() {
             return this;
         }
 
-        protected WhereModel buildWhereModel() {
+        protected EmbeddedWhereModel buildWhereModel() {
             return super.buildModel();
         }
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -38,7 +38,7 @@
 import org.mybatis.dynamic.sql.util.Utilities;
 import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
 import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class QueryExpressionDSL<R>
         extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>>
@@ -275,7 +275,7 @@ public FromGatherer<R> build() {
     public class QueryExpressionWhereBuilder extends AbstractWhereFinisher<QueryExpressionWhereBuilder>
             implements Buildable<R> {
         private QueryExpressionWhereBuilder() {
-            super(selectDSL.statementConfiguration);
+            super(QueryExpressionDSL.this);
         }
 
         public UnionBuilder union() {
@@ -325,7 +325,7 @@ protected QueryExpressionWhereBuilder getThis() {
             return this;
         }
 
-        protected WhereModel buildWhereModel() {
+        protected EmbeddedWhereModel buildWhereModel() {
             return super.buildModel();
         }
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java
@@ -29,7 +29,7 @@
 import org.mybatis.dynamic.sql.TableExpression;
 import org.mybatis.dynamic.sql.select.join.JoinModel;
 import org.mybatis.dynamic.sql.util.Validator;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class QueryExpressionModel {
     private final String connector;
@@ -38,7 +38,7 @@ public class QueryExpressionModel {
     private final TableExpression table;
     private final JoinModel joinModel;
     private final Map<SqlTable, String> tableAliases;
-    private final WhereModel whereModel;
+    private final EmbeddedWhereModel whereModel;
     private final GroupByModel groupByModel;
     private final HavingModel havingModel;
 
@@ -75,7 +75,7 @@ public Map<SqlTable, String> tableAliases() {
         return tableAliases;
     }
 
-    public Optional<WhereModel> whereModel() {
+    public Optional<EmbeddedWhereModel> whereModel() {
         return Optional.ofNullable(whereModel);
     }
 
@@ -101,7 +101,7 @@ public static class Builder {
         private final List<BasicColumn> selectList = new ArrayList<>();
         private TableExpression table;
         private final Map<SqlTable, String> tableAliases = new HashMap<>();
-        private WhereModel whereModel;
+        private EmbeddedWhereModel whereModel;
         private JoinModel joinModel;
         private GroupByModel groupByModel;
         private HavingModel havingModel;
@@ -136,7 +136,7 @@ public Builder withTableAliases(Map<SqlTable, String> tableAliases) {
             return this;
         }
 
-        public Builder withWhereModel(WhereModel whereModel) {
+        public Builder withWhereModel(EmbeddedWhereModel whereModel) {
             this.whereModel = whereModel;
             return this;
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java
@@ -32,7 +32,7 @@
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.util.StringUtilities;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class QueryExpressionRenderer {
     private final QueryExpressionModel queryExpression;
@@ -166,7 +166,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
         return queryExpression.whereModel().flatMap(this::renderWhereClause);
     }
 
-    private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
+    private Optional<FragmentAndParameters> renderWhereClause(EmbeddedWhereModel whereModel) {
         return whereModel.render(renderingContext);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java
@@ -45,7 +45,7 @@
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
 import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class UpdateDSL<R> extends AbstractWhereStarter<UpdateDSL<R>.UpdateWhereBuilder, UpdateDSL<R>>
         implements Buildable<R> {
@@ -192,7 +192,7 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
     public class UpdateWhereBuilder extends AbstractWhereFinisher<UpdateWhereBuilder> implements Buildable<R> {
 
         private UpdateWhereBuilder() {
-            super(statementConfiguration);
+            super(UpdateDSL.this);
         }
 
         public UpdateDSL<R> limit(long limit) {
@@ -219,7 +219,7 @@ protected UpdateWhereBuilder getThis() {
             return this;
         }
 
-        protected WhereModel buildWhereModel() {
+        protected EmbeddedWhereModel buildWhereModel() {
             return buildModel();
         }
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java
@@ -32,12 +32,12 @@
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Validator;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class UpdateModel {
     private final SqlTable table;
     private final String tableAlias;
-    private final WhereModel whereModel;
+    private final EmbeddedWhereModel whereModel;
     private final List<AbstractColumnMapping> columnMappings;
     private final Long limit;
     private final OrderByModel orderByModel;
@@ -62,7 +62,7 @@ public Optional<String> tableAlias() {
         return Optional.ofNullable(tableAlias);
     }
 
-    public Optional<WhereModel> whereModel() {
+    public Optional<EmbeddedWhereModel> whereModel() {
         return Optional.ofNullable(whereModel);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java b/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java
@@ -32,7 +32,7 @@
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.util.Validator;
-import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class UpdateRenderer {
     private final UpdateModel updateModel;
@@ -101,7 +101,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
         return updateModel.whereModel().flatMap(this::renderWhereClause);
     }
 
-    private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
+    private Optional<FragmentAndParameters> renderWhereClause(EmbeddedWhereModel whereModel) {
         return whereModel.render(renderingContext);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereFinisher.java b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereFinisher.java
@@ -27,10 +27,10 @@
 
 public abstract class AbstractWhereFinisher<T extends AbstractWhereFinisher<T>> extends AbstractBooleanExpressionDSL<T>
         implements ConfigurableStatement<T> {
-    private final StatementConfiguration statementConfiguration;
+    private final ConfigurableStatement<?> parentStatement;
 
-    protected AbstractWhereFinisher(StatementConfiguration statementConfiguration) {
-        this.statementConfiguration = Objects.requireNonNull(statementConfiguration);
+    protected AbstractWhereFinisher(ConfigurableStatement<?> parentStatement) {
+        this.parentStatement = Objects.requireNonNull(parentStatement);
     }
 
     void initialize(SqlCriterion sqlCriterion) {
@@ -44,15 +44,14 @@ void initialize(SqlCriterion sqlCriterion, List<AndOrCriteriaGroup> subCriteria)
 
     @Override
     public T configureStatement(Consumer<StatementConfiguration> consumer) {
-        consumer.accept(statementConfiguration);
+        parentStatement.configureStatement(consumer);
         return getThis();
     }
 
-    protected WhereModel buildModel() {
-        return new WhereModel.Builder()
+    protected EmbeddedWhereModel buildModel() {
+        return new EmbeddedWhereModel.Builder()
                 .withInitialCriterion(getInitialCriterion())
                 .withSubCriteria(subCriteria)
-                .withStatementConfiguration(statementConfiguration)
                 .build();
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/EmbeddedWhereModel.java b/src/main/java/org/mybatis/dynamic/sql/where/EmbeddedWhereModel.java
@@ -0,0 +1,47 @@
+/*
+ *    Copyright 2016-2024 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where;
+
+import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionModel;
+import org.mybatis.dynamic.sql.render.RenderingContext;
+import org.mybatis.dynamic.sql.util.FragmentAndParameters;
+import org.mybatis.dynamic.sql.where.render.WhereRenderer;
+
+import java.util.Optional;
+
+public class EmbeddedWhereModel extends AbstractBooleanExpressionModel {
+    private EmbeddedWhereModel(Builder builder) {
+        super(builder);
+    }
+
+    public Optional<FragmentAndParameters> render(RenderingContext renderingContext) {
+        return WhereRenderer.withWhereModel(this)
+                .withRenderingContext(renderingContext)
+                .build()
+                .render();
+    }
+
+    public static class Builder extends AbstractBuilder<Builder> {
+        public EmbeddedWhereModel build() {
+            return new EmbeddedWhereModel(this);
+        }
+
+        @Override
+        protected Builder getThis() {
+            return this;
+        }
+    }
+}
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`import org.mybatis.dynamic.sql.util.Utilities;`
`31`	`31`	`import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;`
`32`	`32`	`import org.mybatis.dynamic.sql.where.AbstractWhereStarter;`
`33`		`-import org.mybatis.dynamic.sql.where.WhereModel;`
	`33`	`+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;`
`34`	`34`
`35`	`35`	`public class DeleteDSL<R> extends AbstractWhereStarter<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>`
`36`	`36`	`implements Buildable<R> {`
`@@ -111,7 +111,7 @@ public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlia`
`111`	`111`	`public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder> implements Buildable<R> {`
`112`	`112`
`113`	`113`	`private DeleteWhereBuilder() {`
`114`		`- super(statementConfiguration);`
	`114`	`+ super(DeleteDSL.this);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public DeleteDSL<R> limit(long limit) {`
`@@ -138,7 +138,7 @@ protected DeleteWhereBuilder getThis() {`
`138`	`138`	`return this;`
`139`	`139`	`}`
`140`	`140`
`141`		`- protected WhereModel buildWhereModel() {`
	`141`	`+ protected EmbeddedWhereModel buildWhereModel() {`
`142`	`142`	`return buildModel();`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`import org.mybatis.dynamic.sql.util.Buildable;`
`28`	`28`	`import org.mybatis.dynamic.sql.util.Utilities;`
`29`	`29`	`import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;`
`30`		`-import org.mybatis.dynamic.sql.where.WhereModel;`
	`30`	`+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* DSL for building count queries. Count queries are specializations of select queries. They have joins and where`
`@@ -131,7 +131,7 @@ public CountDSL<R> from(SqlTable table) {`
`131`	`131`	`public class CountWhereBuilder extends AbstractWhereFinisher<CountWhereBuilder>`
`132`	`132`	`implements Buildable<R> {`
`133`	`133`	`private CountWhereBuilder() {`
`134`		`- super(statementConfiguration);`
	`134`	`+ super(CountDSL.this);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@NotNull`
`@@ -145,7 +145,7 @@ protected CountWhereBuilder getThis() {`
`145`	`145`	`return this;`
`146`	`146`	`}`
`147`	`147`
`148`		`- protected WhereModel buildWhereModel() {`
	`148`	`+ protected EmbeddedWhereModel buildWhereModel() {`
`149`	`149`	`return super.buildModel();`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`import org.mybatis.dynamic.sql.util.Utilities;`
`39`	`39`	`import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;`
`40`	`40`	`import org.mybatis.dynamic.sql.where.AbstractWhereStarter;`
`41`		`-import org.mybatis.dynamic.sql.where.WhereModel;`
	`41`	`+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;`
`42`	`42`
`43`	`43`	`public class QueryExpressionDSL<R>`
`44`	`44`	`extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>>`
`@@ -275,7 +275,7 @@ public FromGatherer<R> build() {`
`275`	`275`	`public class QueryExpressionWhereBuilder extends AbstractWhereFinisher<QueryExpressionWhereBuilder>`
`276`	`276`	`implements Buildable<R> {`
`277`	`277`	`private QueryExpressionWhereBuilder() {`
`278`		`- super(selectDSL.statementConfiguration);`
	`278`	`+ super(QueryExpressionDSL.this);`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`public UnionBuilder union() {`
`@@ -325,7 +325,7 @@ protected QueryExpressionWhereBuilder getThis() {`
`325`	`325`	`return this;`
`326`	`326`	`}`
`327`	`327`
`328`		`- protected WhereModel buildWhereModel() {`
	`328`	`+ protected EmbeddedWhereModel buildWhereModel() {`
`329`	`329`	`return super.buildModel();`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`import org.mybatis.dynamic.sql.util.FragmentAndParameters;`
`33`	`33`	`import org.mybatis.dynamic.sql.util.FragmentCollector;`
`34`	`34`	`import org.mybatis.dynamic.sql.util.StringUtilities;`
`35`		`-import org.mybatis.dynamic.sql.where.WhereModel;`
	`35`	`+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;`
`36`	`36`
`37`	`37`	`public class QueryExpressionRenderer {`
`38`	`38`	`private final QueryExpressionModel queryExpression;`
`@@ -166,7 +166,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {`
`166`	`166`	`return queryExpression.whereModel().flatMap(this::renderWhereClause);`
`167`	`167`	`}`
`168`	`168`
`169`		`- private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {`
	`169`	`+ private Optional<FragmentAndParameters> renderWhereClause(EmbeddedWhereModel whereModel) {`
`170`	`170`	`return whereModel.render(renderingContext);`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;`
`46`	`46`	`import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;`
`47`	`47`	`import org.mybatis.dynamic.sql.where.AbstractWhereStarter;`
`48`		`-import org.mybatis.dynamic.sql.where.WhereModel;`
	`48`	`+import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;`
`49`	`49`
`50`	`50`	`public class UpdateDSL<R> extends AbstractWhereStarter<UpdateDSL<R>.UpdateWhereBuilder, UpdateDSL<R>>`
`51`	`51`	`implements Buildable<R> {`
`@@ -192,7 +192,7 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {`
`192`	`192`	`public class UpdateWhereBuilder extends AbstractWhereFinisher<UpdateWhereBuilder> implements Buildable<R> {`
`193`	`193`
`194`	`194`	`private UpdateWhereBuilder() {`
`195`		`- super(statementConfiguration);`
	`195`	`+ super(UpdateDSL.this);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`public UpdateDSL<R> limit(long limit) {`
`@@ -219,7 +219,7 @@ protected UpdateWhereBuilder getThis() {`
`219`	`219`	`return this;`
`220`	`220`	`}`
`221`	`221`
`222`		`- protected WhereModel buildWhereModel() {`
	`222`	`+ protected EmbeddedWhereModel buildWhereModel() {`
`223`	`223`	`return buildModel();`
`224`	`224`	`}`
`225`	`225`	`}`