Merge pull request #135 from jeffgbutler/master

New names for update helper functions in the canonical mappers

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/update/UpdateDSLCompleter.java

@@ -62,7 +62,7 @@
  * the following method would set all fields of a record based on whether or not the values are null:
  * 
  * <pre>
- * static UpdateDSL&lt;UpdateModel&gt; updateSelective(PersonRecord record,
+ * static UpdateDSL&lt;UpdateModel&gt; updateSelectiveColumns(PersonRecord record,
  *         UpdateDSL&lt;UpdateModel&gt; dsl) {
  *     return dsl.set(id).equalToWhenPresent(record::getId)
  *             .set(firstName).equalToWhenPresent(record::getFirstName)
@@ -77,7 +77,7 @@
  * 
  * <pre>
  * rows = mapper.update(c -&gt;
- *        PersonMapper.updateSelective(record, c)
+ *        PersonMapper.updateSelectiveColumns(record, c)
  *        .where(id, isLessThan(100)));
  * </pre>
  * 

src/site/markdown/docs/kotlin.md

@@ -340,7 +340,7 @@ val rows = mapper.update {
 It is also possible to write a utility method that will set values. For example:
 
 ```kotlin
-fun UpdateDSL<UpdateModel>.updateSelective(record: PersonRecord) =
+fun UpdateDSL<UpdateModel>.updateSelectiveColumns(record: PersonRecord) =
         apply {
             set(id).equalToWhenPresent(record::id)
             set(firstName).equalToWhenPresent(record::firstName)
@@ -356,7 +356,7 @@ This method will selectively set values if corresponding fields in a record are
 
 ```kotlin
 val rows = mapper.update {
-    updateSelective(updateRecord)
+    updateSelectiveColumns(updateRecord)
     where(id, isEqualTo(100))
 }
 ```

src/site/markdown/docs/mybatis3.md

@@ -244,7 +244,7 @@ int rows = mapper.update(c ->
 It is also possible to write a utility method that will set values. For example:
 
 ```java
-static UpdateDSL<UpdateModel> updateSelective(PersonRecord record,
+static UpdateDSL<UpdateModel> updateSelectiveColumns(PersonRecord record,
         UpdateDSL<UpdateModel> dsl) {
     return dsl.set(id).equalToWhenPresent(record::getId)
             .set(firstName).equalToWhenPresent(record::getFirstName)
@@ -259,7 +259,7 @@ This method will selectively set values if corresponding fields in a record are
 
 ```java
 rows = mapper.update(h ->
-    updateSelective(updateRecord, h)
+    updateSelectiveColumns(updateRecord, h)
     .where(id, isEqualTo(100)));
 ```
 

src/test/java/examples/simple/PersonMapper.java

@@ -166,7 +166,7 @@ default int update(UpdateDSLCompleter completer) {
         return MyBatis3Utils.update(this::update, person, completer);
     }
 
-    static UpdateDSL<UpdateModel> updateAll(PersonRecord record,
+    static UpdateDSL<UpdateModel> updateAllColumns(PersonRecord record,
             UpdateDSL<UpdateModel> dsl) {
         return dsl.set(id).equalTo(record::getId)
                 .set(firstName).equalTo(record::getFirstName)
@@ -177,7 +177,7 @@ static UpdateDSL<UpdateModel> updateAll(PersonRecord record,
                 .set(addressId).equalTo(record::getAddressId);
     }
 
-    static UpdateDSL<UpdateModel> updateSelective(PersonRecord record,
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(PersonRecord record,
             UpdateDSL<UpdateModel> dsl) {
         return dsl.set(id).equalToWhenPresent(record::getId)
                 .set(firstName).equalToWhenPresent(record::getFirstName)

src/test/java/examples/simple/PersonMapperTest.java

@@ -335,7 +335,7 @@ public void testUpdate() {
             record.setOccupation("Programmer");
 
             rows = mapper.update(c ->
-                PersonMapper.updateAll(record, c)
+                PersonMapper.updateAllColumns(record, c)
                 .where(id, isEqualTo(100))
                 .and(firstName, isEqualTo("Joe")));
 
@@ -394,7 +394,7 @@ public void testUpdateAll() {
             PersonRecord updateRecord = new PersonRecord();
             updateRecord.setOccupation("Programmer");
             rows = mapper.update(c ->
-                PersonMapper.updateSelective(updateRecord, c));
+                PersonMapper.updateSelectiveColumns(updateRecord, c));
 
             assertThat(rows).isEqualTo(7);
 
@@ -423,7 +423,7 @@ public void testUpdateSelective() {
             PersonRecord updateRecord = new PersonRecord();
             updateRecord.setOccupation("Programmer");
             rows = mapper.update(c ->
-                PersonMapper.updateSelective(updateRecord, c)
+                PersonMapper.updateSelectiveColumns(updateRecord, c)
                 .where(id, isEqualTo(100)));
 
             assertThat(rows).isEqualTo(1);

src/test/kotlin/examples/kotlin/canonical/PersonMapperExtensions.kt

@@ -97,7 +97,7 @@ fun PersonMapper.selectByPrimaryKey(id_: Int) =
 fun PersonMapper.update(completer: UpdateCompleter) =
         MyBatis3Utils.update(this::update, Person, completer)
 
-fun UpdateDSL<UpdateModel>.updateAll(record: PersonRecord) =
+fun UpdateDSL<UpdateModel>.updateAllColumns(record: PersonRecord) =
         apply {
             set(id).equalTo(record::id)
             set(firstName).equalTo(record::firstName)
@@ -108,7 +108,7 @@ fun UpdateDSL<UpdateModel>.updateAll(record: PersonRecord) =
             set(addressId).equalTo(record::addressId)
         }
 
-fun UpdateDSL<UpdateModel>.updateSelective(record: PersonRecord) =
+fun UpdateDSL<UpdateModel>.updateSelectiveColumns(record: PersonRecord) =
         apply {
             set(id).equalToWhenPresent(record::id)
             set(firstName).equalToWhenPresent(record::firstName)

src/test/kotlin/examples/kotlin/canonical/PersonMapperTest.kt

@@ -275,7 +275,7 @@ class PersonMapperTest {
             record.occupation = "Programmer"
 
             rows = mapper.update {
-                updateAll(record)
+                updateAllColumns(record)
                 where(id, isEqualTo(100))
                 and(firstName, isEqualTo("Joe"))
             }
@@ -322,7 +322,7 @@ class PersonMapperTest {
             val updateRecord = PersonRecord(occupation = "Programmer")
 
             rows = mapper.update {
-                updateSelective(updateRecord)
+                updateSelectiveColumns(updateRecord)
             }
 
             assertThat(rows).isEqualTo(7)
@@ -345,7 +345,7 @@ class PersonMapperTest {
             val updateRecord = PersonRecord(occupation = "Programmer")
 
             rows = mapper.update {
-                updateSelective(updateRecord)
+                updateSelectiveColumns(updateRecord)
                 where(id, isEqualTo(100))
             }