Merge pull request #39 from jeffgbutler/master

Propagate custom parameter name to sub criteria

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java

@@ -98,6 +98,7 @@ private <S> FragmentAndParameters renderSubCriterion(SqlCriterion<S> subCriterio
                 .withSequence(sequence)
                 .withRenderingStrategy(renderingStrategy)
                 .withTableAliasCalculator(tableAliasCalculator)
+                .withParameterName(parameterName)
                 .build()
                 .render();
     }

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

@@ -0,0 +1,45 @@
+/**
+ *    Copyright 2016-2018 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
+ *
+ *       http://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 static org.assertj.core.api.Assertions.assertThat;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
+
+import java.sql.JDBCType;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
+
+@RunWith(JUnitPlatform.class)
+public class WhereModelTest {
+
+    @Test
+    public void testThatParameterNameCarriesToSubCriteria() {
+        SqlTable table = SqlTable.of("foo");
+        SqlColumn<Integer> id = table.column("id", JDBCType.INTEGER);
+        
+        WhereClauseProvider wc = where(id, isEqualTo(3), or(id, isEqualTo(4)))
+                .build()
+                .render(RenderingStrategy.MYBATIS3, "myName");
+
+        assertThat(wc.getWhereClause()).isEqualTo("where (id = #{myName.parameters.p1,jdbcType=INTEGER} or id = #{myName.parameters.p2,jdbcType=INTEGER})");
+    }
+}