重写 SelectiveEnhanced 插件

src/main/java/com/itfsw/mybatis/generator/plugins/IncrementsPlugin.java

@@ -99,7 +99,12 @@ public class IncrementsPlugin extends BasePlugin {
      */
     @Override
     public boolean sqlMapUpdateByExampleSelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
-        generatedWithSelective(element, introspectedTable, true);
+        if (PluginTools.checkDependencyPlugin(context, SelectiveEnhancedPlugin.class)) {
+            // TODO SelectiveEnhancedPlugin.sqlMapUpdateByExampleSelectiveElementGenerated
+        } else {
+            generatedWithSelective(element, introspectedTable, true);
+        }
+
         return true;
     }
 
@@ -135,7 +140,12 @@ public class IncrementsPlugin extends BasePlugin {
      */
     @Override
     public boolean sqlMapUpdateByPrimaryKeySelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
-        generatedWithSelective(element, introspectedTable, false);
+        if (PluginTools.checkDependencyPlugin(context, SelectiveEnhancedPlugin.class)) {
+            // TODO SelectiveEnhancedPlugin.sqlMapUpdateByPrimaryKeySelectiveElementGenerated
+        } else {
+            generatedWithSelective(element, introspectedTable, false);
+        }
+
         return true;
     }
 

src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java

@@ -339,21 +339,7 @@ public class LogicalDeletePlugin extends BasePlugin {
 
                 logicalDeleteByPrimaryKey.addElement(new TextElement(sb1.toString()));
 
-                boolean and = false;
-                for (IntrospectedColumn introspectedColumn : introspectedTable.getPrimaryKeyColumns()) {
-                    sb.setLength(0);
-                    if (and) {
-                        sb.append("  and ");
-                    } else {
-                        sb.append("where ");
-                        and = true;
-                    }
-
-                    sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
-                    sb.append(" = "); 
-                    sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn));
-                    logicalDeleteByPrimaryKey.addElement(new TextElement(sb.toString()));
-                }
+                XmlElementGeneratorTools.generateWhereByPrimaryKeyTo(logicalDeleteByPrimaryKey, introspectedTable.getPrimaryKeyColumns());
 
                 document.getRootElement().addElement(logicalDeleteByPrimaryKey);
                 logger.debug("itfsw(逻辑删除插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加方法logicalDeleteByPrimaryKey的实现。");
@@ -394,21 +380,7 @@ public class LogicalDeletePlugin extends BasePlugin {
                 sb.append(introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime());
                 selectByPrimaryKey.addElement(new TextElement(sb.toString()));
 
-                and = false;
-                for (IntrospectedColumn introspectedColumn : introspectedTable.getPrimaryKeyColumns()) {
-                    sb.setLength(0);
-                    if (and) {
-                        sb.append("  and "); 
-                    } else {
-                        sb.append("where "); 
-                        and = true;
-                    }
-
-                    sb.append(MyBatis3FormattingUtilities.getAliasedEscapedColumnName(introspectedColumn));
-                    sb.append(" = ");
-                    sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn));
-                    selectByPrimaryKey.addElement(new TextElement(sb.toString()));
-                }
+                XmlElementGeneratorTools.generateWhereByPrimaryKeyTo(selectByPrimaryKey, introspectedTable.getPrimaryKeyColumns());
 
                 // 逻辑删除的判断
                 sb.setLength(0);

src/main/java/com/itfsw/mybatis/generator/plugins/ModelColumnPlugin.java

@@ -17,6 +17,7 @@
 package com.itfsw.mybatis.generator.plugins;
 
 import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
+import com.itfsw.mybatis.generator.plugins.utils.JavaElementGeneratorTools;
 import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
 import org.mybatis.generator.api.dom.java.*;
@@ -73,12 +74,11 @@ public class ModelColumnPlugin extends BasePlugin {
 
     /**
      * 生成Column字段枚举
-     *
      * @param topLevelClass
      * @param introspectedTable
      * @return
      */
-    private InnerEnum generateColumnEnum(TopLevelClass topLevelClass, IntrospectedTable introspectedTable){
+    private InnerEnum generateColumnEnum(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
         // 生成内部枚举
         InnerEnum innerEnum = new InnerEnum(new FullyQualifiedJavaType(ENUM_NAME));
         innerEnum.setVisibility(JavaVisibility.PUBLIC);
@@ -93,6 +93,18 @@ public class ModelColumnPlugin extends BasePlugin {
         commentGenerator.addFieldComment(columnField, introspectedTable);
         innerEnum.addField(columnField);
 
+        Field javaPropertyField = new Field("javaProperty", FullyQualifiedJavaType.getStringInstance());
+        javaPropertyField.setVisibility(JavaVisibility.PRIVATE);
+        javaPropertyField.setFinal(true);
+        commentGenerator.addFieldComment(javaPropertyField, introspectedTable);
+        innerEnum.addField(javaPropertyField);
+
+        Field jdbcTypeField = new Field("jdbcType", FullyQualifiedJavaType.getStringInstance());
+        jdbcTypeField.setVisibility(JavaVisibility.PRIVATE);
+        jdbcTypeField.setFinal(true);
+        commentGenerator.addFieldComment(jdbcTypeField, introspectedTable);
+        innerEnum.addField(jdbcTypeField);
+
         Method mValue = new Method("value");
         mValue.setVisibility(JavaVisibility.PUBLIC);
         mValue.setReturnType(FullyQualifiedJavaType.getStringInstance());
@@ -107,10 +119,22 @@ public class ModelColumnPlugin extends BasePlugin {
         commentGenerator.addGeneralMethodComment(mGetValue, introspectedTable);
         innerEnum.addMethod(mGetValue);
 
+        Method mGetJavaProperty = JavaElementGeneratorTools.generateGetterMethod(javaPropertyField);
+        commentGenerator.addGeneralMethodComment(mGetJavaProperty, introspectedTable);
+        innerEnum.addMethod(mGetJavaProperty);
+
+        Method mGetJdbcType = JavaElementGeneratorTools.generateGetterMethod(jdbcTypeField);
+        commentGenerator.addGeneralMethodComment(mGetJdbcType, introspectedTable);
+        innerEnum.addMethod(mGetJdbcType);
+
         Method constructor = new Method(ENUM_NAME);
         constructor.setConstructor(true);
         constructor.addBodyLine("this.column = column;");
+        constructor.addBodyLine("this.javaProperty = javaProperty;");
+        constructor.addBodyLine("this.jdbcType = jdbcType;");
         constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "column"));
+        constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "javaProperty"));
+        constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "jdbcType"));
         commentGenerator.addGeneralMethodComment(constructor, introspectedTable);
         innerEnum.addMethod(constructor);
         logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加构造方法和column属性。");
@@ -123,6 +147,10 @@ public class ModelColumnPlugin extends BasePlugin {
             sb.append(field.getName());
             sb.append("(\"");
             sb.append(introspectedColumn.getActualColumnName());
+            sb.append("\", \"");
+            sb.append(introspectedColumn.getJavaProperty());
+            sb.append("\", \"");
+            sb.append(introspectedColumn.getJdbcTypeName());
             sb.append("\")");
 
             innerEnum.addEnumConstant(sb.toString());

src/main/java/com/itfsw/mybatis/generator/plugins/utils/XmlElementGeneratorTools.java

@@ -346,7 +346,7 @@ public class XmlElementGeneratorTools {
                 sb.setLength(0);
             }
         }
-        if (sb.length() > 0 || bracket){
+        if (sb.length() > 0 || bracket) {
             list.add(new TextElement(sb.append(bracket ? ")" : "").toString()));
         }
 
@@ -372,22 +372,38 @@ public class XmlElementGeneratorTools {
         }
 
         for (IntrospectedColumn introspectedColumn : columns) {
-            XmlElement eleIf = new XmlElement("if");
-            eleIf.addAttribute(new Attribute("test", introspectedColumn.getJavaProperty(prefix) + " != null"));
+            if (type != 3 && (introspectedColumn.isSequenceColumn() || introspectedColumn.getFullyQualifiedJavaType().isPrimitive())) {
+                // if it is a sequence column, it is not optional
+                // This is required for MyBatis3 because MyBatis3 parses
+                // and calculates the SQL before executing the selectKey
+
+                // if it is primitive, we cannot do a null check
+                switch (type) {
+                    case 2:
+                        eleTrim.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
+                        break;
+                    case 1:
+                        eleTrim.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + ","));
+                        break;
+                }
+            } else {
+                XmlElement eleIf = new XmlElement("if");
+                eleIf.addAttribute(new Attribute("test", introspectedColumn.getJavaProperty(prefix) + " != null"));
+
+                switch (type) {
+                    case 3:
+                        eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + " = " + MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
+                        break;
+                    case 2:
+                        eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
+                        break;
+                    case 1:
+                        eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + ","));
+                        break;
+                }
 
-            switch (type) {
-                case 3:
-                    eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + " = " + MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
-                    break;
-                case 2:
-                    eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
-                    break;
-                case 1:
-                    eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + ","));
-                    break;
+                eleTrim.addElement(eleIf);
             }
-
-            eleTrim.addElement(eleIf);
         }
 
         return eleTrim;
@@ -413,4 +429,39 @@ public class XmlElementGeneratorTools {
         return list;
     }
 
+    /**
+     * 生成 xxxByPrimaryKey 的where 语句
+     * @param element
+     * @param primaryKeyColumns
+     * @return
+     */
+    public static void generateWhereByPrimaryKeyTo(XmlElement element, List<IntrospectedColumn> primaryKeyColumns) {
+        generateWhereByPrimaryKeyTo(element, primaryKeyColumns, null);
+    }
+
+    /**
+     * 生成 xxxByPrimaryKey 的where 语句
+     * @param element
+     * @param primaryKeyColumns
+     * @param prefix
+     * @return
+     */
+    public static void generateWhereByPrimaryKeyTo(XmlElement element, List<IntrospectedColumn> primaryKeyColumns, String prefix) {
+        StringBuilder sb = new StringBuilder();
+        boolean and = false;
+        for (IntrospectedColumn introspectedColumn : primaryKeyColumns) {
+            sb.setLength(0);
+            if (and) {
+                sb.append("  and ");
+            } else {
+                sb.append("where ");
+                and = true;
+            }
+
+            sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
+            sb.append(" = ");
+            sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix));
+            element.addElement(new TextElement(sb.toString()));
+        }
+    }
 }

src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java

@@ -160,7 +160,7 @@ public class BatchInsertPluginTest {
                                 .getObject()
                 );
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "batchInsert", params);
-                Assert.assertEquals(sql, "insert into tb (field1, field2) values ('test', null) ,  ('test', 1)");
+                Assert.assertEquals(sql, "insert into tb (field1, field2) values ('test', null) , ('test', 1)");
                 // 2. 执行sql
                 Object count = tbMapper.invoke("batchInsert", params);
                 Assert.assertEquals(count, 2);
@@ -197,7 +197,7 @@ public class BatchInsertPluginTest {
                 Array.set(columns, 0, columnField2.getObject());
 
                 String sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "batchInsertSelective", params, columns);
-                Assert.assertEquals(sql, "insert into tb_blobs ( field2 ) values ( 'null' ) ,  ( 'test123' )");
+                Assert.assertEquals(sql, "insert into tb_blobs ( field2 ) values ( 'null' ) , ( 'test123' )");
                 // 2. 执行sql
                 Object count = tbBlobsMapper.invoke("batchInsertSelective", params, columns);
                 Assert.assertEquals(count, 2);

src/test/java/com/itfsw/mybatis/generator/plugins/ExampleEnhancedPluginTest.java

@@ -116,7 +116,7 @@ public class ExampleEnhancedPluginTest {
                     method.invoke(tbExampleCriteria.getObject(), true, criteriaAdd);
 
                     String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
-                    Assert.assertEquals(sql, "select id, field1 from tb WHERE (  id = '5' )");
+                    Assert.assertEquals(sql, "select id, field1 from tb WHERE ( id = '5' )");
 
                     // 2. andIf false
                     ObjectUtil tbExample1 = new ObjectUtil(loader, packagz + ".TbExample");

src/test/java/com/itfsw/mybatis/generator/plugins/IncrementsPluginTest.java

@@ -132,9 +132,9 @@ public class IncrementsPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExample", tbBuilder.invoke("build"), tbExample.getObject());
-                Assert.assertEquals(sql, "update tb set id = null, field1 = 'null', inc_f1 =  inc_f1 + 100 , inc_f2 = null, inc_f3 = null WHERE (  id = '3' )");
+                Assert.assertEquals(sql, "update tb set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = null, inc_f3 = null WHERE ( id = '3' )");
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
-                Assert.assertEquals(sql, "update tb SET inc_f1 =  inc_f1 + 100 WHERE (  id = '3' )");
+                Assert.assertEquals(sql, "update tb SET inc_f1 = inc_f1 + 100 WHERE ( id = '3' )");
                 // 执行
                 // inc_f1 增加100
                 Object result = tbMapper.invoke("updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
@@ -167,9 +167,9 @@ public class IncrementsPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKey", tbKeysBuilder.invoke("build"));
-                Assert.assertEquals(sql, "update tb_keys set field1 = 'null', field2 = null, inc_f1 =  inc_f1 + 10 , inc_f2 =  null , inc_f3 =  inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
+                Assert.assertEquals(sql, "update tb_keys set field1 = 'null', field2 = null, inc_f1 = inc_f1 + 10 , inc_f2 = null , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
                 sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKeySelective", tbKeysBuilder.invoke("build"));
-                Assert.assertEquals(sql, "update tb_keys SET inc_f1 =  inc_f1 + 10 , inc_f3 =  inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
+                Assert.assertEquals(sql, "update tb_keys SET inc_f1 = inc_f1 + 10 , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
                 // 执行
                 result = tbKeysMapper.invoke("updateByPrimaryKeySelective", tbKeysBuilder.invoke("build"));
                 Assert.assertEquals(result, 1);
@@ -194,17 +194,17 @@ public class IncrementsPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByExampleWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"), tbBlobsExample.getObject());
-                Assert.assertEquals(sql, "update tb_blobs set id = null, field1 = 'null', inc_f1 =  inc_f1 + 100 , inc_f2 = 50, inc_f3 =  null , field2 = 'null', field3 = 'blob' WHERE (  id = '3' )");
+                Assert.assertEquals(sql, "update tb_blobs set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' WHERE ( id = '3' )");
 
                 tbBlobsWithBLOBsBuilder.invoke("id", 3l);
                 sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
-                Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 =  inc_f1 + 100 , inc_f2 = 50, inc_f3 =  null , field2 = 'null', field3 = 'blob' where id = 3");
+                Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' where id = 3");
 
                 // 执行
                 tbBlobsWithBLOBsBuilder.invoke("incF3", 10l);
                 // 测试自增字段没有配置自增参数
                 sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
-                Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 =  inc_f1 + 100 , inc_f2 = 50, inc_f3 =  10 , field2 = 'null', field3 = 'blob' where id = 3");
+                Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = 10 , field2 = 'null', field3 = 'blob' where id = 3");
                 result = tbBlobsMapper.invoke("updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
                 Assert.assertEquals(result, 1);
             }

src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java

@@ -93,7 +93,7 @@ public class LogicalDeletePluginTest {
 
                 // 验证sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "logicalDeleteByExample", tbExample.getObject());
-                Assert.assertEquals(sql, "update tb set del_flag = 1 WHERE (  id = '1' )");
+                Assert.assertEquals(sql, "update tb set del_flag = 1 WHERE ( id = '1' )");
                 // 验证执行
                 Object result = tbMapper.invoke("logicalDeleteByExample", tbExample.getObject());
                 Assert.assertEquals(result, 1);
@@ -147,7 +147,7 @@ public class LogicalDeletePluginTest {
 
                 // 验证sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
-                Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE (  del_flag = '1' and id = '3' )");
+                Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '1' and id = '3' )");
                 // 验证执行
                 Object result = tbMapper.invoke("selectByExample", tbExample.getObject());
                 Assert.assertEquals(((List)result).size(), 1);
@@ -174,7 +174,7 @@ public class LogicalDeletePluginTest {
 
                 // 验证sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
-                Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE (  del_flag = '0' and id = '3' )");
+                Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '0' and id = '3' )");
                 // 验证执行
                 Object result = tbMapper.invoke("selectByExample", tbExample.getObject());
                 Assert.assertEquals(((List)result).size(), 0);
@@ -215,7 +215,7 @@ public class LogicalDeletePluginTest {
 
                 // 验证sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByPrimaryKeyWithLogicalDelete", 5l, true);
-                Assert.assertEquals(sql, "select  id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 , ts_2 from tb where id = 5 and del_flag =  '1'");
+                Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 , ts_2 from tb where id = 5 and del_flag = '1'");
                 // 验证执行
                 Object result = tbMapper.invoke("selectByPrimaryKeyWithLogicalDelete", 5l, true);
                 Assert.assertNull(result);

src/test/java/com/itfsw/mybatis/generator/plugins/OldSelectiveEnhancedPluginTest.java

@@ -111,7 +111,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( field_1, inc_f2 )  values ( 'null', 5 )");
+                Assert.assertEquals(sql, "insert into tb ( field_1, inc_f2 ) values ( 'null', 5 )");
                 Object result = tbMapper.invoke("insertSelective", tb.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -146,7 +146,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5  WHERE (  id = '1' )");
+                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 WHERE ( id = '1' )");
                 Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -178,7 +178,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject());
-                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5  where id = 2");
+                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 where id = 2");
                 Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -212,7 +212,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 )  values ( 10, 'null', 5 )  on duplicate key update  id = 10, field_1 = 'null', inc_f2 = 5");
+                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) values ( 10, 'null', 5 ) on duplicate key update id = 10, field_1 = 'null', inc_f2 = 5");
                 Object result = tbMapper.invoke("upsertSelective", tb.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -250,7 +250,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 )  select 99, 'null', 5  from dual where not exists ( select 1 from tb WHERE (  id = '99' )  ) ; update tb set inc_f2 = 5, inc_f3 = 10  WHERE (  id = '99' )");
+                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' )");
                 Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
                 Assert.assertEquals(result, 1);
                 result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());

src/test/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePluginTest.java

@@ -61,7 +61,7 @@ public class SelectOneByExamplePluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExample", TbExample.getObject());
-                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE (  id = '1' )  limit 1");
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id = '1' ) limit 1");
                 Object result = tbMapper.invoke("selectOneByExample", TbExample.getObject());
                 ObjectUtil Tb = new ObjectUtil(result);
                 Assert.assertEquals(Tb.get("id"), 1l);
@@ -88,7 +88,7 @@ public class SelectOneByExamplePluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "selectOneByExampleWithBLOBs", TbBlobsExample.getObject());
-                Assert.assertEquals(sql, "select id, field1 , field2, field3 from tb_blobs WHERE (  id = '1' )  limit 1");
+                Assert.assertEquals(sql, "select id, field1 , field2, field3 from tb_blobs WHERE ( id = '1' ) limit 1");
                 Object result = TbBlobsMapper.invoke("selectOneByExampleWithBLOBs", TbBlobsExample.getObject());
                 ObjectUtil Tb = new ObjectUtil(result);
                 Assert.assertEquals(Tb.get("id"), 1l);

src/test/java/com/itfsw/mybatis/generator/plugins/SelectSelectivePluginTest.java

@@ -66,7 +66,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns1, 0, columnField1.getObject());
 
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
-                Assert.assertEquals(sql, "select field1 from tb WHERE (  id < '100' )  order by field2 asc");
+                Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field2 asc");
 
                 ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
                 Object columns2 = Array.newInstance(columnField1.getCls(), 2);
@@ -74,7 +74,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns2, 1, columnField2.getObject());
 
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
-                Assert.assertEquals(sql, "select field1 ,  field2 from tb WHERE (  id < '100' )  order by field2 asc");
+                Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field2 asc");
 
 
                 // 2. 执行sql
@@ -104,7 +104,7 @@ public class SelectSelectivePluginTest {
                 tbExample.invoke("setDistinct", true);
                 tbExample.set("orderByClause", "field1 asc");
                 String sql1 = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
-                Assert.assertEquals(sql1, "select distinct field1 from tb WHERE (  id < '100' )  order by field1 asc");
+                Assert.assertEquals(sql1, "select distinct field1 from tb WHERE ( id < '100' ) order by field1 asc");
                 List list1 = (List) tbMapper.invoke("selectByExampleSelective", tbExample.getObject(), columns1);
                 Assert.assertEquals(list1.size(), 3);
             }
@@ -188,7 +188,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns1, 0, columnField1.getObject());
 
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExampleSelective", tbExample.getObject(), columns1);
-                Assert.assertEquals(sql, "select field1 from tb WHERE (  id = '3' )  order by field2 asc limit 1");
+                Assert.assertEquals(sql, "select field1 from tb WHERE ( id = '3' ) order by field2 asc limit 1");
 
                 // 2. 执行sql
                 Object result = tbMapper.invoke("selectOneByExampleSelective", tbExample.getObject(), columns1);
@@ -223,7 +223,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns1, 0, columnField1.getObject());
 
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
-                Assert.assertEquals(sql, "select field1 from tb WHERE (  id < '100' )  order by field1 asc");
+                Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc");
 
                 ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
                 Object columns2 = Array.newInstance(columnField1.getCls(), 2);
@@ -231,7 +231,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns2, 1, columnField2.getObject());
 
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
-                Assert.assertEquals(sql, "select field1 ,  field2 from tb WHERE (  id < '100' )  order by field1 asc");
+                Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc");
 
 
                 // 2. 执行sql
@@ -277,7 +277,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns1, 0, columnField1.getObject());
 
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
-                Assert.assertEquals(sql, "select field1 from tb WHERE (  id < '100' )  order by field1 asc");
+                Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc");
 
                 ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
                 Object columns2 = Array.newInstance(columnField1.getCls(), 2);
@@ -285,7 +285,7 @@ public class SelectSelectivePluginTest {
                 Array.set(columns2, 1, columnField2.getObject());
 
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
-                Assert.assertEquals(sql, "select field1 ,  field2 from tb WHERE (  id < '100' )  order by field1 asc");
+                Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc");
 
 
                 // 2. 执行sql

src/test/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPluginTest.java

 /*
- * Copyright (c) 2017.
+ * Copyright (c) 2018.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import java.sql.SQLException;
  *
  * ---------------------------------------------------------------------------
  * @author: hewei
- * @time:2017/7/28 15:47
+ * @time:2018/4/20 10:57
  * ---------------------------------------------------------------------------
  */
 public class SelectiveEnhancedPluginTest {
@@ -42,7 +42,7 @@ public class SelectiveEnhancedPluginTest {
      */
     @BeforeClass
     public static void init() throws SQLException, IOException, ClassNotFoundException {
-        DBHelper.createDB("scripts/SelectiveEnhancedPlugin/init.sql");
+        DBHelper.createDB("scripts/OldSelectiveEnhancedPlugin/init.sql");
     }
 
     /**
@@ -55,36 +55,10 @@ public class SelectiveEnhancedPluginTest {
         tool.generate();
         Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin插件需配合com.itfsw.mybatis.generator.plugins.ModelColumnPlugin插件使用！");
 
-        // 2. 没有配置UpsertPlugin插件位置配置错误
-        tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator-with-UpsertPlugin-with-wrong-place.xml");
+        // 2. 同时配置了OldSelectiveEnhancedPlugin插件
+        tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator-with-OldSelectiveEnhancedPlugin.xml");
         tool.generate();
-        Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin插件建议配置在插件com.itfsw.mybatis.generator.plugins.UpsertPlugin后面，否则某些功能可能得不到增强！");
-    }
-
-    /**
-     * 测试Model
-     */
-    @Test
-    public void testModel() throws IOException, XMLParserException, InvalidConfigurationException, InterruptedException, SQLException {
-        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator.xml");
-        tool.generate(new AbstractShellCallback() {
-            @Override
-            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
-                ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
-                ObjectUtil TbColumnField1 = new ObjectUtil(loader, packagz + ".Tb$Column#field1");
-                ObjectUtil TbColumnTsIncF2 = new ObjectUtil(loader, packagz + ".Tb$Column#tsIncF2");
-
-                Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
-                Array.set(columns, 0, TbColumnField1.getObject());
-                Array.set(columns, 1, TbColumnTsIncF2.getObject());
-
-                tb.invoke("selective", columns);
-                Assert.assertTrue((Boolean) tb.invoke("hasSelective"));
-                Assert.assertTrue((Boolean) tb.invoke("hasSelective", "field_1"));
-                Assert.assertFalse((Boolean) tb.invoke("hasSelective", "inc_f1"));
-                Assert.assertTrue((Boolean) tb.invoke("hasSelective", "inc_f2"));
-            }
-        });
+        Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin不能和com.itfsw.mybatis.generator.plugins.OldSelectiveEnhancedPlugin插件同时使用！");
     }
 
     /**
@@ -107,12 +81,11 @@ public class SelectiveEnhancedPluginTest {
                 Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
                 Array.set(columns, 0, TbColumnField1.getObject());
                 Array.set(columns, 1, TbColumnTsIncF2.getObject());
-                tb.invoke("selective", columns);
 
                 // sql
-                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( field_1, inc_f2 )  values ( 'null', 5 )");
-                Object result = tbMapper.invoke("insertSelective", tb.getObject());
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject(), columns);
+                Assert.assertEquals(sql, "insert into tb ( field_1 , inc_f2 ) values ( 'null' , 5 )");
+                Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
                 Assert.assertEquals(result, 1);
             }
         });
@@ -142,12 +115,11 @@ public class SelectiveEnhancedPluginTest {
                 Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
                 Array.set(columns, 0, TbColumnField1.getObject());
                 Array.set(columns, 1, TbColumnTsIncF2.getObject());
-                tb.invoke("selective", columns);
 
                 // sql
-                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5  WHERE (  id = '1' )");
-                Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject());
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
+                Assert.assertEquals(sql, "update tb SET field_1 = 'null' , inc_f2 = 5 WHERE ( id = '1' )");
+                Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
                 Assert.assertEquals(result, 1);
             }
         });
@@ -174,12 +146,11 @@ public class SelectiveEnhancedPluginTest {
                 Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
                 Array.set(columns, 0, TbColumnField1.getObject());
                 Array.set(columns, 1, TbColumnTsIncF2.getObject());
-                tb.invoke("selective", columns);
 
                 // sql
-                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject());
-                Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5  where id = 2");
-                Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject());
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject(), columns);
+                Assert.assertEquals(sql, "update tb SET field_1 = 'null' , inc_f2 = 5 where id = 2");
+                Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject(), columns);
                 Assert.assertEquals(result, 1);
             }
         });
@@ -208,12 +179,11 @@ public class SelectiveEnhancedPluginTest {
                 Array.set(columns, 0, TbColumnId.getObject());
                 Array.set(columns, 1, TbColumnField1.getObject());
                 Array.set(columns, 2, TbColumnTsIncF2.getObject());
-                tb.invoke("selective", columns);
 
                 // sql
-                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 )  values ( 10, 'null', 5 )  on duplicate key update  id = 10, field_1 = 'null', inc_f2 = 5");
-                Object result = tbMapper.invoke("upsertSelective", tb.getObject());
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject(), columns);
+                Assert.assertEquals(sql, "insert into tb ( id , field_1 , inc_f2 ) values ( 10 , 'null' , 5 ) on duplicate key update id = 10 , field_1 = 'null' , inc_f2 = 5");
+                Object result = tbMapper.invoke("upsertSelective", tb.getObject(), columns);
                 Assert.assertEquals(result, 1);
             }
         });
@@ -246,16 +216,15 @@ public class SelectiveEnhancedPluginTest {
                 Array.set(columns, 0, TbColumnId.getObject());
                 Array.set(columns, 1, TbColumnField1.getObject());
                 Array.set(columns, 2, TbColumnTsIncF2.getObject());
-                tb.invoke("selective", columns);
 
                 // sql
-                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 )  select 99, 'null', 5  from dual where not exists ( select 1 from tb WHERE (  id = '99' )  ) ; update tb set inc_f2 = 5, inc_f3 = 10  WHERE (  id = '99' )");
-                Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
+                Assert.assertEquals(sql, "insert into tb ( id , field_1 , inc_f2 ) select 99 , 'null' , 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set id = 99 , field_1 = 'null' , inc_f2 = 5 WHERE ( id = '99' )");
+                Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
                 Assert.assertEquals(result, 1);
-                result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
+                result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
                 Assert.assertEquals(result, 0);
             }
         });
     }
-}
+}
\ No newline at end of file

src/test/java/com/itfsw/mybatis/generator/plugins/UpsertPluginTest.java

@@ -79,7 +79,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsert", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb (id, field1, field2) values (10, 'ts1', 5) on duplicate key update  id = 10,  field1 = 'ts1',  field2 = 5");
+                Assert.assertEquals(sql, "insert into tb (id, field1, field2) values (10, 'ts1', 5) on duplicate key update id = 10, field1 = 'ts1', field2 = 5");
                 Object result = tbMapper.invoke("upsert", tb.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -112,7 +112,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertWithBLOBs", TbBlobsWithBLOBs.getObject());
-                Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) values (10, 'ts1', 'ts2',  'null') on duplicate key update  id = 10,  field1 = 'ts1',  field2 = 'ts2',  field3 = 'null'");
+                Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) values (10, 'ts1', 'ts2', 'null') on duplicate key update id = 10, field1 = 'ts1', field2 = 'ts2', field3 = 'null'");
                 Object result = TbBlobsMapper.invoke("upsertWithBLOBs", TbBlobsWithBLOBs.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -133,7 +133,7 @@ public class UpsertPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertWithBLOBs", TbSingleBlob.getObject());
-                Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) values (10, 3, 'ts1' ) on duplicate key update  id = 10,  field2 = 3,  field1 = 'ts1'");
+                Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) values (10, 3, 'ts1' ) on duplicate key update id = 10, field2 = 3, field1 = 'ts1'");
                 result = TbSingleBlobMapper.invoke("upsertWithBLOBs", TbSingleBlob.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -165,7 +165,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field1 )  values ( 20, 'ts1' )  on duplicate key update  id = 20, field1 = 'ts1'");
+                Assert.assertEquals(sql, "insert into tb ( id, field1 ) values ( 20, 'ts1' ) on duplicate key update id = 20, field1 = 'ts1'");
                 Object result = tbMapper.invoke("upsertSelective", tb.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -179,7 +179,7 @@ public class UpsertPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertSelective", TbBlobsWithBLOBs.getObject());
-                Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 )  values ( 500, 'ts1', 'ts2' )  on duplicate key update  id = 500, field1 = 'ts1', field2 = 'ts2'");
+                Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) values ( 500, 'ts1', 'ts2' ) on duplicate key update id = 500, field1 = 'ts1', field2 = 'ts2'");
                 result = TbBlobsMapper.invoke("upsertSelective", TbBlobsWithBLOBs.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -208,7 +208,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE (  id = '50' )  ) ; update tb set field1 = 'ts1',  field2 = 5 WHERE (  id = '50' )");
+                Assert.assertEquals(sql, "insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) ) ; update tb set field1 = 'ts1', field2 = 5 WHERE ( id = '50' )");
                 Object result = tbMapper.invoke("upsertByExample", tb.getObject(), TbExample.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -245,7 +245,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
-                Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) select 60, 'ts1', 'ts2',  'null' from dual where not exists ( select 1 from tb_blobs WHERE (  id = '60' )  ) ; update tb_blobs set id = 60,  field1 = 'ts1',  field2 = 'ts2',  field3 = 'null' WHERE (  id = '60' )");
+                Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) select 60, 'ts1', 'ts2', 'null' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set id = 60, field1 = 'ts1', field2 = 'ts2', field3 = 'null' WHERE ( id = '60' )");
                 Object result = TbBlobsMapper.invoke("upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -271,7 +271,7 @@ public class UpsertPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject());
-                Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) select 70, 3, 'ts1' from dual where not exists ( select 1 from tb_single_blob WHERE (  id = '70' )  ) ; update tb_single_blob set id = 70,  field2 = 3,  field1 = 'ts1' WHERE (  id = '70' )");
+                Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) select 70, 3, 'ts1' from dual where not exists ( select 1 from tb_single_blob WHERE ( id = '70' ) ) ; update tb_single_blob set id = 70, field2 = 3, field1 = 'ts1' WHERE ( id = '70' )");
                 result = TbSingleBlobMapper.invoke("upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -307,7 +307,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "insert into tb ( id, field1 )  select 100, 'ts1'  from dual where not exists ( select 1 from tb WHERE (  id = '100' )  ) ; update tb set field1 = 'ts1'  WHERE (  id = '100' )");
+                Assert.assertEquals(sql, "insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) ) ; update tb set field1 = 'ts1' WHERE ( id = '100' )");
                 Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
                 Assert.assertEquals(result, 1);
 
@@ -325,7 +325,7 @@ public class UpsertPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
-                Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 )  select 200, 'ts1', 'ts2'  from dual where not exists ( select 1 from tb_blobs WHERE (  id = '60' )  ) ; update tb_blobs set field1 = 'ts1', field2 = 'ts2'  WHERE (  id = '60' )");
+                Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' )");
                 result = TbBlobsMapper.invoke("upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
                 Assert.assertEquals(result, 1);
             }

src/test/java/com/itfsw/mybatis/generator/plugins/tools/SqlHelper.java

@@ -60,7 +60,7 @@ public class SqlHelper {
      */
     public static String getFormatMapperSql(Object mapper, String methodName, Object... args) {
         String sql = getMapperSql(mapper, methodName, args);
-        return sql == null ? null : sql.replaceAll("\n\\s*", " ");
+        return sql == null ? null : sql.replaceAll("\n", " ").replaceAll("\\s+", " ");
     }
 
     /**

src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator-with-OldSelectiveEnhancedPlugin.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2018.
+  ~
+  ~ 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.
+  -->
+
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <properties resource="db.properties"/>
+
+    <!--导入属性配置 -->
+    <context id="default" targetRuntime="MyBatis3">
+        <!-- 插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin" />
+        <plugin type="com.itfsw.mybatis.generator.plugins.OldSelectiveEnhancedPlugin" />
+        <plugin type="com.itfsw.mybatis.generator.plugins.ModelColumnPlugin"/>
+
+        <!--jdbc的数据库连接 -->
+        <jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
+        <!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
+            targetPackage     指定生成的model生成所在的包名
+            targetProject     指定在该项目下所在的路径  -->
+        <javaModelGenerator targetPackage="" targetProject=""/>
+        <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
+        <sqlMapGenerator targetPackage="" targetProject="" />
+        <!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
+            type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
+            type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
+            type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
+        <javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
+
+        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+        <table tableName="tb">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+
+            <columnOverride column="inc_f2" property="tsIncF2"/>
+        </table>
+    </context>
+</generatorConfiguration>
\ No newline at end of file

src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator-without-ModelColumnPlugin.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2017.
+  ~ Copyright (c) 2018.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2018.
+  ~
+  ~ 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.
+  -->
+
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <properties resource="db.properties"/>
+
+    <!--导入属性配置 -->
+    <context id="default" targetRuntime="MyBatis3">
+        <!-- 插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.UpsertPlugin">
+            <property name="allowMultiQueries" value="true"/>
+        </plugin>
+        <plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin"/>
+        <plugin type="com.itfsw.mybatis.generator.plugins.ModelColumnPlugin"/>
+
+        <!--jdbc的数据库连接 -->
+        <jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
+        <!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
+            targetPackage     指定生成的model生成所在的包名
+            targetProject     指定在该项目下所在的路径  -->
+        <javaModelGenerator targetPackage="" targetProject=""/>
+        <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
+        <sqlMapGenerator targetPackage="" targetProject="" />
+        <!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
+            type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
+            type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
+            type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
+        <javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
+
+        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+        <table tableName="tb">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+
+            <columnOverride column="inc_f2" property="tsIncF2"/>
+        </table>
+    </context>
+</generatorConfiguration>
\ No newline at end of file