[maven-release-plugin] prepare release V1.2.9

README.md

@@ -23,7 +23,7 @@
 * [查询结果选择性返回插件（SelectSelectivePlugin）](#15-查询结果选择性返回插件)
 * [~~官方ConstructorBased配置BUG临时修正插件（ConstructorBasedBugFixPlugin）~~](#16-官方constructorbased配置bug临时修正插件)
 * [乐观锁插件（OptimisticLockerPlugin）](#17-乐观锁插件)
-* [表重命名配置插件（TableConfigurationPlugin）](#18-表重命名配置插件)
+* [表重命名配置插件（TableRenameConfigurationPlugin）](#18-表重命名配置插件)
 
 ---------------------------------------
 Maven引用：  
@@ -31,7 +31,7 @@ Maven引用：
 <dependency>
   <groupId>com.itfsw</groupId>
   <artifactId>mybatis-generator-plugin</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.8</version>
 </dependency>
 ```
 ---------------------------------------
@@ -226,7 +226,9 @@ public class Test {
 * Criteria的快速返回example()方法。  
 * Criteria链式调用增强，以前如果有按条件增加的查询语句会打乱链式查询构建，现在有了andIf(boolean ifAdd, CriteriaAdd add)方法可一直使用链式调用下去。
 * Example增强了setOrderByClause方法，新增orderBy(String orderByClause)方法直接返回example，增强链式调用，可以一路.下去了。
-* 继续增强orderBy(String orderByClause)方法，增加orderBy(String ... orderByClauses)方法，配合数据Model属性对应Column获取插件（ModelColumnPlugin）使用效果更佳。   
+* 继续增强orderBy(String orderByClause)方法，增加orderBy(String ... orderByClauses)方法，配合数据Model属性对应Column获取插件（ModelColumnPlugin）使用效果更佳。 
+* 增加基于column的操作，当配置了[数据Model属性对应Column获取插件（ModelColumnPlugin）](#8-数据model属性对应column获取插件)插件时，提供column之间的比对操作。  
+
 插件：
 ```xml
 <!-- Example Criteria 增强插件 -->
@@ -300,6 +302,19 @@ public class Test {
                 // 这个配合数据Model属性对应Column获取插件（ModelColumnPlugin）使用
                 .orderBy(Tb.Column.field1.asc(), Tb.Column.field3.desc())
         );
+        
+        // -----------------------------------column-----------------------------------
+        this.tbMapper.selectByExample(
+                new TbExample()
+                .createCriteria()
+                .andField1EqualToColumn(Tb.Column.field2)   // where field1 = field2
+                .andField1NotEqualToColumn(Tb.Column.field2)    // where field1 <> field2
+                .andField1GreaterThanColumn(Tb.Column.field2)   // where field1 > field2
+                .andField1GreaterThanOrEqualToColumn(Tb.Column.field2)  // where field1 >= field2
+                .andField1LessThanColumn(Tb.Column.field2)  // where field1 < field2
+                .andField1LessThanOrEqualToColumn(Tb.Column.field2) // where field1 <= field2
+                .example()
+        );
     }
 }
 ```
@@ -1269,12 +1284,12 @@ public class Test {
 <xml>
     <!-- 表重命名配置插件 -->
     <plugin type="com.itfsw.mybatis.generator.plugins.TableRenameConfigurationPlugin">
-        <!-- TbMapper --> TbDao, TbMapper.xml --> TbDao.xml -->
+        <!-- TbMapper -> TbDao, TbMapper.xml -> TbDao.xml -->
         <property name="clientSuffix" value="Dao"/>
-        <!-- TbExmaple --> TbQuery -->
+        <!-- TbExmaple -> TbQuery -->
         <property name="exampleSuffix" value="Query"/>
-        <!-- Tb --> TbEntity -->
+        <!-- Tb -> TbEntity -->
         <property name="modelSuffix" value="Entity"/>
     </plugin>
 </xml>
-```
+```

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.itfsw</groupId>
     <artifactId>mybatis-generator-plugin</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.9</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -217,7 +217,7 @@
         <connection>scm:git:https://github.com/itfsw/mybatis-generator-plugin.git</connection>
         <developerConnection>scm:git:https://github.com/itfsw/mybatis-generator-plugin.git</developerConnection>
         <url>https://github.com/itfsw/mybatis-generator-plugin</url>
-      <tag>V1.2.6</tag>
+      <tag>V1.2.9</tag>
   </scm>
 
     <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++distribution++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

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

@@ -231,7 +231,7 @@ public class BatchInsertPlugin extends BasePlugin {
         foreachInsertColumns.addAttribute(new Attribute("collection", "selective"));
         foreachInsertColumns.addAttribute(new Attribute("item", "column"));
         foreachInsertColumns.addAttribute(new Attribute("separator", ","));
-        foreachInsertColumns.addElement(new TextElement("${column.value}"));
+        foreachInsertColumns.addElement(new TextElement("${column.escapedColumnName}"));
 
         eles.add(foreachInsertColumns);
 
@@ -260,7 +260,7 @@ public class BatchInsertPlugin extends BasePlugin {
         for (int i = 0; i < columns1.size(); i++) {
             IntrospectedColumn introspectedColumn = columns.get(i);
             XmlElement check = new XmlElement("if");
-            check.addAttribute(new Attribute("test", "'" + introspectedColumn.getActualColumnName() + "' == column.value"));
+            check.addAttribute(new Attribute("test", "'" + introspectedColumn.getActualColumnName() + "'.toString() == column.value"));
             check.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, "item.")));
 
             foreachInsertColumnsCheck.addElement(check);

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

@@ -3,13 +3,18 @@ package com.itfsw.mybatis.generator.plugins;
 import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
 import com.itfsw.mybatis.generator.plugins.utils.FormatTools;
 import com.itfsw.mybatis.generator.plugins.utils.JavaElementGeneratorTools;
+import com.itfsw.mybatis.generator.plugins.utils.PluginTools;
 import com.itfsw.mybatis.generator.plugins.utils.enhanced.InnerInterface;
 import com.itfsw.mybatis.generator.plugins.utils.enhanced.InnerInterfaceWrapperToInnerClass;
+import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
 import org.mybatis.generator.api.dom.java.*;
+import org.mybatis.generator.codegen.mybatis3.MyBatis3FormattingUtilities;
 
 import java.util.List;
 
+import static org.mybatis.generator.internal.util.StringUtility.stringHasValue;
+
 /**
  * ---------------------------------------------------------------------------
  * Example 增强插件
@@ -19,6 +24,17 @@ import java.util.List;
  * ---------------------------------------------------------------------------
  */
 public class ExampleEnhancedPlugin extends BasePlugin {
+    private boolean enableColumnOperate = false;    // 是否启用column的操作
+
+    /**
+     * {@inheritDoc}
+     * @param introspectedTable
+     */
+    @Override
+    public void initialized(IntrospectedTable introspectedTable) {
+        super.initialized(introspectedTable);
+        this.enableColumnOperate = PluginTools.checkDependencyPlugin(context, ModelColumnPlugin.class);
+    }
 
     /**
      * ModelExample Methods 生成
@@ -36,6 +52,11 @@ public class ExampleEnhancedPlugin extends BasePlugin {
                 addFactoryMethodToCriteria(topLevelClass, innerClass, introspectedTable);
                 // andIf
                 addAndIfMethodToCriteria(topLevelClass, innerClass, introspectedTable);
+            } else if ("GeneratedCriteria".equals(innerClass.getType().getShortName())) {
+                // column 方法
+                if (this.enableColumnOperate) {
+                    addColumnMethodToCriteria(topLevelClass, innerClass, introspectedTable);
+                }
             }
         }
 
@@ -53,6 +74,88 @@ public class ExampleEnhancedPlugin extends BasePlugin {
         return true;
     }
 
+    /**
+     * 添加列操作方法
+     * @param topLevelClass
+     * @param innerClass
+     * @param introspectedTable
+     */
+    private void addColumnMethodToCriteria(TopLevelClass topLevelClass, InnerClass innerClass, IntrospectedTable introspectedTable) {
+        // !!!!! Column import比较特殊引入的是外部类
+        topLevelClass.addImportedType(introspectedTable.getRules().calculateAllFieldsClass());
+        for (IntrospectedColumn introspectedColumn : introspectedTable.getNonBLOBColumns()) {
+            topLevelClass.addImportedType(introspectedColumn.getFullyQualifiedJavaType());
+            // EqualTo
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "EqualTo", "="));
+            // NotEqualTo
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "NotEqualTo", "<>"));
+            // GreaterThan
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "GreaterThan", ">"));
+            // GreaterThanOrEqualTo
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "GreaterThanOrEqualTo", ">="));
+            // LessThan
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "LessThan", "<"));
+            // LessThanOrEqualTo
+            FormatTools.addMethodWithBestPosition(innerClass, this.generateSingleValueMethod(introspectedTable, introspectedColumn, "LessThanOrEqualTo", "<="));
+        }
+    }
+
+    /**
+     * 生成column操作的具体方法
+     * @param introspectedTable
+     * @param introspectedColumn
+     * @param nameFragment
+     * @param operator
+     * @return
+     */
+    private Method generateSingleValueMethod(IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn, String nameFragment, String operator) {
+        // 方法名
+        StringBuilder sb = new StringBuilder();
+        sb.append(introspectedColumn.getJavaProperty());
+        sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
+        sb.insert(0, "and");
+        sb.append(nameFragment);
+        sb.append("Column");
+
+        Method method = JavaElementGeneratorTools.generateMethod(
+                sb.toString(),
+                JavaVisibility.PUBLIC,
+                FullyQualifiedJavaType.getCriteriaInstance(),
+                new Parameter(
+                        new FullyQualifiedJavaType(introspectedTable.getRules().calculateAllFieldsClass().getShortName() + "." + ModelColumnPlugin.ENUM_NAME),
+                        "column"
+                )
+        );
+        commentGenerator.addGeneralMethodComment(method, introspectedTable);
+
+        // 方法体
+        sb.setLength(0);
+        if (stringHasValue(introspectedColumn.getTypeHandler())) {
+            sb.append("add");
+            sb.append(introspectedColumn.getJavaProperty());
+            sb.setCharAt(3, Character.toUpperCase(sb.charAt(3)));
+            sb.append("Criterion(");
+        } else {
+            sb.append("addCriterion(");
+        }
+        sb.append("new StringBuilder(\"");
+        sb.append(MyBatis3FormattingUtilities.getAliasedActualColumnName(introspectedColumn));
+        sb.append(" ");
+        sb.append(operator);
+        sb.append(" \").append(");
+        sb.append("column.");
+        sb.append(ModelColumnPlugin.METHOD_GET_ESCAPED_COLUMN_NAME);
+        sb.append("()).toString());");
+
+        JavaElementGeneratorTools.generateMethodBody(
+                method,
+                sb.toString(),
+                "return (Criteria) this;"
+        );
+
+        return method;
+    }
+
     /**
      * 添加工厂方法
      * @param topLevelClass

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

@@ -329,7 +329,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH
                     sb.append("column.value");
 
                     when.addAttribute(new Attribute("test", sb.toString()));
-                    when.addElement(new TextElement("${column.value} = ${column.value} ${record." + FIELD_INC_MAP + "."
+                    when.addElement(new TextElement("${column.escapedColumnName} = ${column.escapedColumnName} ${record." + FIELD_INC_MAP + "."
                             + introspectedColumn.getActualColumnName()
                             + ".value} #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
                     choose.addElement(when);
@@ -338,13 +338,13 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH
 
             if (versionColumn == null) {
                 XmlElement otherwise = new XmlElement("otherwise");
-                otherwise.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
+                otherwise.addElement(new TextElement("${column.escapedColumnName} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
                 choose.addElement(otherwise);
             } else {
                 XmlElement when = new XmlElement("when");
                 when.addAttribute(new Attribute("test", "column.value != '" + versionColumn.getActualColumnName() + "'.toString()"));
 
-                when.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
+                when.addElement(new TextElement("${column.escapedColumnName} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
 
                 choose.addElement(when);
             }

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

@@ -23,6 +23,7 @@ import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
 import org.mybatis.generator.api.dom.java.*;
 import org.mybatis.generator.internal.util.JavaBeansUtil;
+import org.mybatis.generator.internal.util.StringUtility;
 
 /**
  * ---------------------------------------------------------------------------
@@ -35,6 +36,10 @@ import org.mybatis.generator.internal.util.JavaBeansUtil;
 public class ModelColumnPlugin extends BasePlugin {
     public static final String ENUM_NAME = "Column";  // 内部Enum名
     public static final String METHOD_EXCLUDES = "excludes";   // 方法名
+    public static final String METHOD_GET_ESCAPED_COLUMN_NAME = "getEscapedColumnName";    // 方法名
+
+    public static final String CONST_BEGINNING_DELIMITER = "BEGINNING_DELIMITER";   // const
+    public static final String CONST_ENDING_DELIMITER = "ENDING_DELIMITER";   // const
 
     /**
      * Model Methods 生成
@@ -88,6 +93,29 @@ public class ModelColumnPlugin extends BasePlugin {
         commentGenerator.addEnumComment(innerEnum, introspectedTable);
         logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + "增加内部Builder类。");
 
+        // 生成常量
+        Field beginningDelimiterField = JavaElementGeneratorTools.generateField(
+                CONST_BEGINNING_DELIMITER,
+                JavaVisibility.PRIVATE,
+                FullyQualifiedJavaType.getStringInstance(),
+                "\"" + StringUtility.escapeStringForJava(context.getBeginningDelimiter()) + "\""
+        );
+        beginningDelimiterField.setStatic(true);
+        beginningDelimiterField.setFinal(true);
+        commentGenerator.addFieldComment(beginningDelimiterField, introspectedTable);
+        innerEnum.addField(beginningDelimiterField);
+
+        Field endingDelimiterField = JavaElementGeneratorTools.generateField(
+                CONST_ENDING_DELIMITER,
+                JavaVisibility.PRIVATE,
+                FullyQualifiedJavaType.getStringInstance(),
+                "\"" + StringUtility.escapeStringForJava(context.getEndingDelimiter()) + "\""
+        );
+        endingDelimiterField.setStatic(true);
+        endingDelimiterField.setFinal(true);
+        commentGenerator.addFieldComment(endingDelimiterField, introspectedTable);
+        innerEnum.addField(endingDelimiterField);
+
         // 生成属性和构造函数
         Field columnField = new Field("column", FullyQualifiedJavaType.getStringInstance());
         columnField.setVisibility(JavaVisibility.PRIVATE);
@@ -95,6 +123,12 @@ public class ModelColumnPlugin extends BasePlugin {
         commentGenerator.addFieldComment(columnField, introspectedTable);
         innerEnum.addField(columnField);
 
+        Field isColumnNameDelimitedField = new Field("isColumnNameDelimited", FullyQualifiedJavaType.getBooleanPrimitiveInstance());
+        isColumnNameDelimitedField.setVisibility(JavaVisibility.PRIVATE);
+        isColumnNameDelimitedField.setFinal(true);
+        commentGenerator.addFieldComment(isColumnNameDelimitedField, introspectedTable);
+        innerEnum.addField(isColumnNameDelimitedField);
+
         Field javaPropertyField = new Field("javaProperty", FullyQualifiedJavaType.getStringInstance());
         javaPropertyField.setVisibility(JavaVisibility.PRIVATE);
         javaPropertyField.setFinal(true);
@@ -134,9 +168,11 @@ public class ModelColumnPlugin extends BasePlugin {
         constructor.addBodyLine("this.column = column;");
         constructor.addBodyLine("this.javaProperty = javaProperty;");
         constructor.addBodyLine("this.jdbcType = jdbcType;");
+        constructor.addBodyLine("this.isColumnNameDelimited = isColumnNameDelimited;");
         constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "column"));
         constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "javaProperty"));
         constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "jdbcType"));
+        constructor.addParameter(new Parameter(FullyQualifiedJavaType.getBooleanPrimitiveInstance(), "isColumnNameDelimited"));
         commentGenerator.addGeneralMethodComment(constructor, introspectedTable);
         FormatTools.addMethodWithBestPosition(innerEnum, constructor);
         logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加构造方法和column属性。");
@@ -153,7 +189,9 @@ public class ModelColumnPlugin extends BasePlugin {
             sb.append(introspectedColumn.getJavaProperty());
             sb.append("\", \"");
             sb.append(introspectedColumn.getJdbcTypeName());
-            sb.append("\")");
+            sb.append("\", ");
+            sb.append(introspectedColumn.isColumnNameDelimited());
+            sb.append(")");
 
             innerEnum.addEnumConstant(sb.toString());
             logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加" + field.getName() + "枚举。");
@@ -163,14 +201,14 @@ public class ModelColumnPlugin extends BasePlugin {
         Method desc = new Method("desc");
         desc.setVisibility(JavaVisibility.PUBLIC);
         desc.setReturnType(FullyQualifiedJavaType.getStringInstance());
-        desc.addBodyLine("return this.column + \" DESC\";");
+        desc.addBodyLine("return this." + METHOD_GET_ESCAPED_COLUMN_NAME + "() + \" DESC\";");
         commentGenerator.addGeneralMethodComment(desc, introspectedTable);
         FormatTools.addMethodWithBestPosition(innerEnum, desc);
 
         Method asc = new Method("asc");
         asc.setVisibility(JavaVisibility.PUBLIC);
         asc.setReturnType(FullyQualifiedJavaType.getStringInstance());
-        asc.addBodyLine("return this.column + \" ASC\";");
+        asc.addBodyLine("return this." + METHOD_GET_ESCAPED_COLUMN_NAME + "() + \" ASC\";");
         commentGenerator.addGeneralMethodComment(asc, introspectedTable);
         FormatTools.addMethodWithBestPosition(innerEnum, asc);
         logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加asc()和desc()方法。");
@@ -197,6 +235,24 @@ public class ModelColumnPlugin extends BasePlugin {
         FormatTools.addMethodWithBestPosition(innerEnum, mExcludes);
         logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加excludes方法。");
 
+        // getEscapedColumnName
+        Method mGetEscapedColumnName = JavaElementGeneratorTools.generateMethod(
+                METHOD_GET_ESCAPED_COLUMN_NAME,
+                JavaVisibility.PUBLIC,
+                FullyQualifiedJavaType.getStringInstance()
+        );
+        commentGenerator.addGeneralMethodComment(mGetEscapedColumnName, introspectedTable);
+        JavaElementGeneratorTools.generateMethodBody(
+                mGetEscapedColumnName,
+                "if (this.isColumnNameDelimited) {",
+                "return new StringBuilder().append(" + CONST_BEGINNING_DELIMITER + ").append(this.column).append(" + CONST_ENDING_DELIMITER + ").toString();",
+                "} else {",
+                "return this.column;",
+                "}"
+        );
+        FormatTools.addMethodWithBestPosition(innerEnum, mGetEscapedColumnName);
+        logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加getEscapedColumnName方法。");
+
         return innerEnum;
     }
 }

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

@@ -336,7 +336,7 @@ public class SelectSelectivePlugin extends BasePlugin implements ISelectOneByExa
         keysEle.addAttribute(new Attribute("collection", "selective"));
         keysEle.addAttribute(new Attribute("item", "column"));
         keysEle.addAttribute(new Attribute("separator", ","));
-        keysEle.addElement(new TextElement("${column.value}"));
+        keysEle.addElement(new TextElement("${column.escapedColumnName}"));
 
         XmlElement otherwiseEle = new XmlElement("otherwise");
         chooseEle.addElement(otherwiseEle);

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

@@ -169,11 +169,9 @@ public class SelectiveEnhancedPlugin extends BasePlugin implements IUpsertPlugin
             // warning has already been reported
             if (introspectedColumn != null) {
                 if (gk.isJdbcStandard()) {
-                    answer.addAttribute(new Attribute("useGeneratedKeys", "true"));
-                    answer.addAttribute(new Attribute("keyProperty", introspectedColumn.getJavaProperty()));
-                    answer.addAttribute(new Attribute("keyColumn", introspectedColumn.getActualColumnName()));
+                    XmlElementGeneratorTools.useGeneratedKeys(answer, introspectedTable, "record.");
                 } else {
-                    answer.addElement(XmlElementGeneratorTools.getSelectKey(introspectedColumn, gk));
+                    answer.addElement(XmlElementGeneratorTools.getSelectKey(introspectedColumn, gk, "record."));
                 }
             }
         }
@@ -397,7 +395,7 @@ public class SelectiveEnhancedPlugin extends BasePlugin implements IUpsertPlugin
         insertForeachEle.addAttribute(new Attribute("open", "("));
         insertForeachEle.addAttribute(new Attribute("separator", ","));
         insertForeachEle.addAttribute(new Attribute("close", ")"));
-        insertForeachEle.addElement(new TextElement("${column.value}"));
+        insertForeachEle.addElement(new TextElement("${column.escapedColumnName}"));
         insertWhenEle.addElement(insertForeachEle);
 
         XmlElement insertOtherwiseEle = new XmlElement("otherwise");
@@ -483,13 +481,13 @@ public class SelectiveEnhancedPlugin extends BasePlugin implements IUpsertPlugin
         Element incrementEle = PluginTools.getHook(IIncrementsPluginHook.class).incrementSetsWithSelectiveEnhancedPluginElementGenerated(versionColumn);
         // 普通情况
         if (incrementEle == null && versionColumn == null) {
-            setForeachEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
+            setForeachEle.addElement(new TextElement("${column.escapedColumnName} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
         } else if (incrementEle != null) {
             setForeachEle.addElement(incrementEle);
         } else if (versionColumn != null) {
             XmlElement ifEle = new XmlElement("if");
             ifEle.addAttribute(new Attribute("test", "column.value != '" + versionColumn.getActualColumnName() + "'.toString()"));
-            ifEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
+            ifEle.addElement(new TextElement("${column.escapedColumnName} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
 
             setForeachEle.addElement(ifEle);
         }

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

@@ -295,7 +295,7 @@ public class UpsertPlugin extends BasePlugin {
         foreachInsertColumns.addAttribute(new Attribute("collection", "selective"));
         foreachInsertColumns.addAttribute(new Attribute("item", "column"));
         foreachInsertColumns.addAttribute(new Attribute("separator", ","));
-        foreachInsertColumns.addElement(new TextElement("${column.value}"));
+        foreachInsertColumns.addElement(new TextElement("${column.escapedColumnName}"));
 
         insertEle.addElement(foreachInsertColumns);
 
@@ -324,7 +324,7 @@ public class UpsertPlugin extends BasePlugin {
         for (int i = 0; i < columns1.size(); i++) {
             IntrospectedColumn introspectedColumn = columns.get(i);
             XmlElement check = new XmlElement("if");
-            check.addAttribute(new Attribute("test", "'" + introspectedColumn.getActualColumnName() + "' == column.value"));
+            check.addAttribute(new Attribute("test", "'" + introspectedColumn.getActualColumnName() + "'.toString() == column.value"));
             check.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, "item.")));
 
             foreachInsertColumnsCheck.addElement(check);
@@ -342,7 +342,7 @@ public class UpsertPlugin extends BasePlugin {
         foreachSetColumns.addAttribute(new Attribute("collection", "selective"));
         foreachSetColumns.addAttribute(new Attribute("item", "column"));
         foreachSetColumns.addAttribute(new Attribute("separator", ","));
-        foreachSetColumns.addElement(new TextElement("${column.value} = values(${column.value})"));
+        foreachSetColumns.addElement(new TextElement("${column.escapedColumnName} = values(${column.escapedColumnName})"));
 
         document.getRootElement().addElement(insertEle);
         logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加batchUpsertSelective实现方法。");

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

@@ -107,6 +107,9 @@ public class BasePlugin extends PluginAdapter {
     @Override
     public void initialized(IntrospectedTable introspectedTable) {
         super.initialized(introspectedTable);
+        if (StringUtility.stringHasValue(introspectedTable.getTableConfiguration().getAlias())){
+            warnings.add("itfsw:插件" + this.getClass().getTypeName() + "请不要配置alias属性，这个属性官方支持也很混乱，导致插件支持会存在问题！");
+        }
         PluginTools.getHook(ITableConfigurationHook.class).tableConfiguration(introspectedTable);
     }
 }

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

@@ -52,11 +52,15 @@ public class XmlElementGeneratorTools {
      * @return the selectKey element
      */
     public static Element getSelectKey(IntrospectedColumn introspectedColumn, GeneratedKey generatedKey) {
+        return getSelectKey(introspectedColumn, generatedKey, null);
+    }
+
+    public static Element getSelectKey(IntrospectedColumn introspectedColumn, GeneratedKey generatedKey, String prefix) {
         String identityColumnType = introspectedColumn.getFullyQualifiedJavaType().getFullyQualifiedName();
 
         XmlElement answer = new XmlElement("selectKey");
         answer.addAttribute(new Attribute("resultType", identityColumnType));
-        answer.addAttribute(new Attribute("keyProperty", introspectedColumn.getJavaProperty()));
+        answer.addAttribute(new Attribute("keyProperty", (prefix == null ? "" : prefix) + introspectedColumn.getJavaProperty()));
         answer.addAttribute(new Attribute("order", generatedKey.getMyBatis3Order()));
 
         answer.addElement(new TextElement(generatedKey.getRuntimeSqlStatement()));

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

@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+package com.itfsw.mybatis.generator.plugins;
+
+import com.itfsw.mybatis.generator.plugins.tools.*;
+import org.apache.ibatis.session.SqlSession;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Array;
+import java.util.List;
+
+/**
+ * ---------------------------------------------------------------------------
+ *
+ * ---------------------------------------------------------------------------
+ * @author: hewei
+ * @time:2018/5/29 15:56
+ * ---------------------------------------------------------------------------
+ */
+public class BugFixedTest {
+    /**
+     * 在使用 ModelColumnPlugin 插件时遇到关键词column或者table定义了alias属性，插件没有正确取值
+     */
+    @Test
+    public void bug0001() throws Exception {
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/BugFixedTest/bug-0001.xml");
+        tool.generate(() -> DBHelper.createDB("scripts/BugFixedTest/bug-0001.sql"), new AbstractShellCallback() {
+            @Override
+            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
+                ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
+
+                ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
+                tb.set("id", 121L);
+                tb.set("inc", "inc_001");
+                tb.set("table", "tb");
+                // selective
+                ObjectUtil TbColumnId = new ObjectUtil(loader, packagz + ".Tb$Column#id");
+                ObjectUtil TbColumnInc = new ObjectUtil(loader, packagz + ".Tb$Column#inc");
+                ObjectUtil TbColumnTable = new ObjectUtil(loader, packagz + ".Tb$Column#table");
+                Object columns = Array.newInstance(TbColumnInc.getCls(), 3);
+                Array.set(columns, 0, TbColumnId.getObject());
+                Array.set(columns, 1, TbColumnInc.getObject());
+                Array.set(columns, 2, TbColumnTable.getObject());
+
+                // sql
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject(), columns);
+                Assert.assertEquals(sql, "insert into tb ( id , field1 , `table` ) values ( 121 , 'inc_001' , 'tb' )");
+                Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
+                Assert.assertEquals(result, 1);
+
+                // 执行查询
+                ObjectUtil tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                ObjectUtil criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdLessThan", 160l);
+                tbExample.set("orderByClause", TbColumnTable.invoke("asc"));
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns);
+                Assert.assertEquals(sql, "select id , field1 , `table` from tb Test WHERE ( Test.id < '160' ) order by `table` ASC");
+                ObjectUtil result1 = new ObjectUtil(((List)tbMapper.invoke("selectByExampleSelective", tbExample.getObject(), columns)).get(0));
+                Assert.assertEquals(result1.get("table"), "tb");
+            }
+        });
+    }
+
+    /**
+     * insertSelective 因为集成SelectiveEnhancedPlugin，传入参数变成map,自增ID返回要修正
+     * @throws Exception
+     */
+    @Test
+    public void bug0002() throws Exception {
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/BugFixedTest/bug-0002.xml");
+        tool.generate(() -> DBHelper.createDB("scripts/BugFixedTest/bug-0002.sql"), new AbstractShellCallback() {
+            @Override
+            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
+                ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
+
+                ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
+                tb.set("field1", "ts1");
+
+                // selective
+                ObjectUtil TbColumnField1 = new ObjectUtil(loader, packagz + ".Tb$Column#field1");
+                Object columns = Array.newInstance(TbColumnField1.getCls(), 1);
+                Array.set(columns, 0, TbColumnField1.getObject());
+
+                // sql
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject(), columns);
+                Assert.assertEquals(sql, "insert into tb ( field1 ) values ( 'ts1' )");
+                Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
+                Assert.assertEquals(result, 1);
+                // 自增ID
+                Assert.assertEquals(tb.get("id"), 1L);
+            }
+        });
+    }
+}

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

@@ -23,11 +23,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
+import java.lang.reflect.*;
 import java.sql.SQLException;
+import java.util.List;
 
 /**
  * ---------------------------------------------------------------------------
@@ -42,7 +40,7 @@ public class ExampleEnhancedPluginTest {
      * 初始化数据库
      */
     @BeforeClass
-    public static void init() throws SQLException, IOException, ClassNotFoundException {
+    public static void init() throws SQLException, IOException {
         DBHelper.createDB("scripts/ExampleEnhancedPlugin/init.sql");
     }
 
@@ -62,7 +60,7 @@ public class ExampleEnhancedPluginTest {
 
                 // 调用example方法能正常返回
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExampleCriteria.invoke("example"));
-                Assert.assertEquals(sql, "select id, field1 from tb");
+                Assert.assertEquals(sql, "select id, field1, field2 from tb");
             }
         });
     }
@@ -85,7 +83,7 @@ public class ExampleEnhancedPluginTest {
                 tbExample.invoke("orderBy", order);  // 可变参数方法直接设置order by
 
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
-                Assert.assertEquals(sql, "select id, field1 from tb order by id desc , field1 asc");
+                Assert.assertEquals(sql, "select id, field1, field2 from tb order by id desc , field1 asc");
             }
         });
     }
@@ -98,37 +96,109 @@ public class ExampleEnhancedPluginTest {
         MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/ExampleEnhancedPlugin/mybatis-generator.xml");
         tool.generate(new AbstractShellCallback() {
             @Override
-            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) {
-                try {
-                    ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
+            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
 
-                    // 1. andIf true
-                    ObjectUtil tbExample = new ObjectUtil(loader, packagz + ".TbExample");
-                    ObjectUtil tbExampleCriteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
 
-                    // 代理实现接口
-                    Object criteriaAdd = Proxy.newProxyInstance(loader, new Class[]{
-                            loader.loadClass(packagz + ".TbExample$Criteria$ICriteriaAdd")
-                    }, new TestInvocationHandler());
-                    Method method = tbExampleCriteria.getMethods("andIf").get(0);
-                    method.invoke(tbExampleCriteria.getObject(), true, criteriaAdd);
+                // 1. andIf true
+                ObjectUtil tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                ObjectUtil tbExampleCriteria = new ObjectUtil(tbExample.invoke("createCriteria"));
 
-                    String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
-                    Assert.assertEquals(sql, "select id, field1 from tb WHERE ( id = '5' )");
+                // 代理实现接口
+                Object criteriaAdd = Proxy.newProxyInstance(loader, new Class[]{
+                        loader.loadClass(packagz + ".TbExample$Criteria$ICriteriaAdd")
+                }, new TestInvocationHandler());
+                Method method = tbExampleCriteria.getMethods("andIf").get(0);
+                method.invoke(tbExampleCriteria.getObject(), true, criteriaAdd);
 
-                    // 2. andIf false
-                    ObjectUtil tbExample1 = new ObjectUtil(loader, packagz + ".TbExample");
-                    ObjectUtil tbExampleCriteria1 = new ObjectUtil(tbExample1.invoke("createCriteria"));
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id = '5' )");
 
-                    method = tbExampleCriteria1.getMethods("andIf").get(0);
-                    method.invoke(tbExampleCriteria1.getObject(), false, criteriaAdd);
+                // 2. andIf false
+                ObjectUtil tbExample1 = new ObjectUtil(loader, packagz + ".TbExample");
+                ObjectUtil tbExampleCriteria1 = new ObjectUtil(tbExample1.invoke("createCriteria"));
 
-                    sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample1.getObject());
-                    Assert.assertEquals(sql, "select id, field1 from tb");
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Assert.assertTrue(false);
-                }
+                method = tbExampleCriteria1.getMethods("andIf").get(0);
+                method.invoke(tbExampleCriteria1.getObject(), false, criteriaAdd);
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample1.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb");
+            }
+        });
+    }
+
+    /**
+     * 测试配置ModelColumnPlugin插件
+     */
+    @Test
+    public void testWithModelColumnPlugin() throws Exception {
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/ExampleEnhancedPlugin/mybatis-generator-with-ModelColumnPlugin.xml");
+        tool.generate(new AbstractShellCallback() {
+            @Override
+            public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
+                ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
+
+                ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
+
+                // 1. EqualTo
+                ObjectUtil tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                ObjectUtil criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdEqualToColumn", columnField2.getObject());
+
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id = field2 )");
+                List list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 1);
+
+                // 2. NotEqualTo
+                tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdNotEqualToColumn", columnField2.getObject());
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id <> field2 )");
+                list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 9);
+
+                // 3. GreaterThan
+                tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdGreaterThanColumn", columnField2.getObject());
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id > field2 )");
+                list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 4);
+
+                // 4. GreaterThanOrEqualTo
+                tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdGreaterThanOrEqualToColumn", columnField2.getObject());
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id >= field2 )");
+                list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 5);
+
+                // 5. LessThan
+                tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdLessThanColumn", columnField2.getObject());
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id < field2 )");
+                list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 5);
+
+                // 6. LessThanOrEqualTo
+                tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdLessThanOrEqualToColumn", columnField2.getObject());
+
+                sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
+                Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id <= field2 )");
+                list = (List) tbMapper.invoke("selectByExample", tbExample.getObject());
+                Assert.assertEquals(list.size(), 6);
             }
         });
     }

src/test/resources/scripts/BugFixedTest/bug-0001.sql

@@ -0,0 +1,28 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : localhost
+Source Server Version : 50617
+Source Host           : localhost:3306
+Source Database       : mybatis-generator-plugin
+
+Target Server Type    : MYSQL
+Target Server Version : 50617
+File Encoding         : 65001
+
+Date: 2017-06-27 11:17:08
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for tb
+-- ----------------------------
+DROP TABLE IF EXISTS `tb`;
+CREATE TABLE `tb` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
+  `field2` int DEFAULT NULL,
+  `table` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

src/test/resources/scripts/BugFixedTest/bug-0001.xml

@@ -0,0 +1,59 @@
+<?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">
+        <property name="autoDelimitKeywords" value="true"/>
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+        
+        <!-- 插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin"/>
+        <plugin type="com.itfsw.mybatis.generator.plugins.SelectSelectivePlugin"/>
+        <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="">
+            <!-- 是否对model添加 构造函数 -->
+            <property name="constructorBased" value="true"/>
+            <!-- 给Model添加一个父类 -->
+            <!--<property name="rootClass" value="com.itfsw.base"/>-->
+        </javaModelGenerator>
+        <!--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" alias="Test">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+            <columnOverride column="field1" property="inc"/>
+        </table>
+    </context>
+</generatorConfiguration>

src/test/resources/scripts/BugFixedTest/bug-0002.sql

@@ -0,0 +1,26 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : localhost
+Source Server Version : 50617
+Source Host           : localhost:3306
+Source Database       : mybatis-generator-plugin
+
+Target Server Type    : MYSQL
+Target Server Version : 50617
+File Encoding         : 65001
+
+Date: 2017-06-27 11:17:08
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for tb
+-- ----------------------------
+DROP TABLE IF EXISTS `tb`;
+CREATE TABLE `tb` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `field1` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

src/test/resources/scripts/BugFixedTest/bug-0002.xml

@@ -0,0 +1,57 @@
+<?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">
+        <property name="autoDelimitKeywords" value="true"/>
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+        
+        <!-- 插件 -->
+        <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="">
+            <!-- 是否对model添加 构造函数 -->
+            <property name="constructorBased" value="true"/>
+            <!-- 给Model添加一个父类 -->
+            <!--<property name="rootClass" value="com.itfsw.base"/>-->
+        </javaModelGenerator>
+        <!--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"/>
+        </table>
+    </context>
+</generatorConfiguration>

src/test/resources/scripts/ExampleEnhancedPlugin/init.sql

@@ -22,19 +22,20 @@ DROP TABLE IF EXISTS `tb`;
 CREATE TABLE `tb` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
   `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
+  `field2` bigint(20) NOT NULL COMMENT '注释3',
   PRIMARY KEY (`id`)
 );
 
 -- ----------------------------
 -- Records of tb
 -- ----------------------------
-INSERT INTO `tb` VALUES ('1', 'f1');
-INSERT INTO `tb` VALUES ('2', 'f2');
-INSERT INTO `tb` VALUES ('3', 'f3');
-INSERT INTO `tb` VALUES ('4', 'f4');
-INSERT INTO `tb` VALUES ('5', 'f5');
-INSERT INTO `tb` VALUES ('6', 'f6');
-INSERT INTO `tb` VALUES ('7', 'f7');
-INSERT INTO `tb` VALUES ('8', 'f8');
-INSERT INTO `tb` VALUES ('9', 'f9');
-INSERT INTO `tb` VALUES ('10', 'f10');
+INSERT INTO `tb` VALUES ('1', 'f1', '1');
+INSERT INTO `tb` VALUES ('2', 'f2', '1');
+INSERT INTO `tb` VALUES ('3', 'f3', '1');
+INSERT INTO `tb` VALUES ('4', 'f4', '1');
+INSERT INTO `tb` VALUES ('5', 'f5', '1');
+INSERT INTO `tb` VALUES ('6', 'f6', '100');
+INSERT INTO `tb` VALUES ('7', 'f7', '100');
+INSERT INTO `tb` VALUES ('8', 'f8', '100');
+INSERT INTO `tb` VALUES ('9', 'f9', '100');
+INSERT INTO `tb` VALUES ('10', 'f10', '100');

src/test/resources/scripts/ExampleEnhancedPlugin/mybatis-generator-with-ModelColumnPlugin.xml

@@ -0,0 +1,53 @@
+<?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.ExampleEnhancedPlugin"/>
+        <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="">
+            <!-- 是否对model添加 构造函数 -->
+            <property name="constructorBased" value="true"/>
+            <!-- 给Model添加一个父类 -->
+            <!--<property name="rootClass" value="com.itfsw.base"/>-->
+        </javaModelGenerator>
+        <!--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"/>
+        </table>
+    </context>
+</generatorConfiguration>