bug:upsert插件对于没有Selective支持的upsert、upsertByExample、upsertWithBLOBs、upsertByExa...

bug:upsert插件对于没有Selective支持的upsert、upsertByExample、upsertWithBLOBs、upsertByExampleWithBLOBs对于自增主键的不支持

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

@@ -126,6 +126,16 @@ public class IncrementsPluginTools {
         return false;
     }
 
+    /**
+     * 生成sets Selective Ele
+     * @param columns
+     * @param prefix
+     * @return
+     */
+    public XmlElement generateSetsSelective(List<IntrospectedColumn> columns, String prefix) {
+        return generateSetsSelective(columns, prefix, false);
+    }
+
     /**
      * 生成sets Selective Ele
      * @param columns
@@ -159,6 +169,16 @@ public class IncrementsPluginTools {
         return eleTrim;
     }
 
+    /**
+     * 生成sets Ele
+     * @param columns
+     * @param prefix
+     * @return
+     */
+    public List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
+        return generateSets(columns, prefix, false);
+    }
+
     /**
      * 生成sets Ele
      * @param columns

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

@@ -137,7 +137,7 @@ public class XmlElementGeneratorTools {
      * @param columns
      * @return
      */
-    public static List<TextElement> generateKeys(List<IntrospectedColumn> columns) {
+    public static List<Element> generateKeys(List<IntrospectedColumn> columns) {
         return generateKeys(columns, true);
     }
 
@@ -147,7 +147,7 @@ public class XmlElementGeneratorTools {
      * @param bracket
      * @return
      */
-    public static List<TextElement> generateKeys(List<IntrospectedColumn> columns, boolean bracket) {
+    public static List<Element> generateKeys(List<IntrospectedColumn> columns, boolean bracket) {
         return generateCommColumns(columns, null, bracket, 1);
     }
 
@@ -186,7 +186,7 @@ public class XmlElementGeneratorTools {
      * @param columns
      * @return
      */
-    public static List<TextElement> generateValues(List<IntrospectedColumn> columns) {
+    public static List<Element> generateValues(List<IntrospectedColumn> columns) {
         return generateValues(columns, null);
     }
 
@@ -196,7 +196,7 @@ public class XmlElementGeneratorTools {
      * @param prefix
      * @return
      */
-    public static List<TextElement> generateValues(List<IntrospectedColumn> columns, String prefix) {
+    public static List<Element> generateValues(List<IntrospectedColumn> columns, String prefix) {
         return generateValues(columns, prefix, true);
     }
 
@@ -207,7 +207,7 @@ public class XmlElementGeneratorTools {
      * @param bracket
      * @return
      */
-    public static List<TextElement> generateValues(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
+    public static List<Element> generateValues(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
         return generateCommColumns(columns, prefix, bracket, 2);
     }
 
@@ -246,8 +246,8 @@ public class XmlElementGeneratorTools {
      * @param columns
      * @return
      */
-    public static List<TextElement> generateSets(List<IntrospectedColumn> columns) {
-        return generateSets(columns, null, false);
+    public static List<Element> generateSets(List<IntrospectedColumn> columns) {
+        return generateSets(columns, null);
     }
 
     /**
@@ -256,7 +256,7 @@ public class XmlElementGeneratorTools {
      * @param prefix
      * @return
      */
-    public static List<TextElement> generateSets(List<IntrospectedColumn> columns, String prefix) {
+    public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
         return generateSets(columns, prefix, false);
     }
 
@@ -267,7 +267,7 @@ public class XmlElementGeneratorTools {
      * @param bracket
      * @return
      */
-    public static List<TextElement> generateSets(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
+    public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
         return generateCommColumns(columns, prefix, bracket, 3);
     }
 
@@ -309,8 +309,8 @@ public class XmlElementGeneratorTools {
      * @param type    1:key,2:value,3:set
      * @return
      */
-    private static List<TextElement> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
-        List<TextElement> list = new ArrayList<>();
+    public static List<Element> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
+        List<Element> list = new ArrayList<>();
         StringBuilder sb = new StringBuilder(bracket ? "(" : "");
         Iterator<IntrospectedColumn> columnIterator = columns.iterator();
         while (columnIterator.hasNext()) {

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

@@ -347,7 +347,7 @@ public class IncrementsPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tbBuilder.invoke("build"), tbExample.getObject());
-                Assert.assertEquals(sql, "update tb set field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1, inc_f3 = 1 WHERE ( field1 = 'ts2' ) ; insert into tb (id, field1, inc_f1, inc_f2, inc_f3) select 20, 'ts2', 10, 1, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts2' ) )");
+                Assert.assertEquals(sql, "update tb set id = 20, field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1, inc_f3 = 1 WHERE ( field1 = 'ts2' ) ; insert into tb (id, field1, inc_f1, inc_f2, inc_f3) select 20, 'ts2', 10, 1, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts2' ) )");
                 tbMapper.invoke("upsertByExample", tbBuilder.invoke("build"), tbExample.getObject());
 
                 // 再次执行触发update
@@ -363,7 +363,7 @@ public class IncrementsPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tbBuilder.invoke("build"));
-                Assert.assertEquals(sql, "insert into tb ( id, field1, inc_f1, inc_f2 ) values ( 30, 'ts2', 10, 1 ) on duplicate key update field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1");
+                Assert.assertEquals(sql, "insert into tb ( id, field1, inc_f1, inc_f2 ) values ( 30, 'ts2', 10, 1 ) on duplicate key update id = 30, field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1");
                 result = tbMapper.invoke("upsert", tbBuilder.invoke("build"));
                 Assert.assertEquals(result, 1);
                 // 再次执行触发update
@@ -382,7 +382,7 @@ public class IncrementsPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
-                Assert.assertEquals(sql, "update tb set field1 = 'ts3', inc_f1 = inc_f1 + 10 , inc_f2 = 1 WHERE ( field1 = 'ts3' ) ; insert into tb ( id, field1, inc_f1, inc_f2 ) select 40, 'ts3', 10, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts3' ) )");
+                Assert.assertEquals(sql, "update tb set id = 40, field1 = 'ts3', inc_f1 = inc_f1 + 10 , inc_f2 = 1 WHERE ( field1 = 'ts3' ) ; insert into tb ( id, field1, inc_f1, inc_f2 ) select 40, 'ts3', 10, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts3' ) )");
                 result = tbMapper.invoke("upsert", tbBuilder.invoke("build"));
                 Assert.assertEquals(result, 1);
                 // 再次执行触发update

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

@@ -99,19 +99,22 @@ public class OldSelectiveEnhancedPluginTest {
                 ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
 
                 ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
+                tb.set("id", 111L);
                 tb.set("incF3", 10l);
                 tb.set("tsIncF2", 5l);
                 // selective
+                ObjectUtil TbColumnId = new ObjectUtil(loader, packagz + ".Tb$Column#id");
                 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());
+                Object columns = Array.newInstance(TbColumnField1.getCls(), 3);
+                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(), "insertSelective", tb.getObject());
-                Assert.assertEquals(sql, "insert into tb ( field_1, inc_f2 ) values ( 'null', 5 )");
+                Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) values ( 111, 'null', 5 )");
                 Object result = tbMapper.invoke("insertSelective", tb.getObject());
                 Assert.assertEquals(result, 1);
             }
@@ -212,7 +215,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 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 +253,7 @@ public class OldSelectiveEnhancedPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' ) ; insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) )");
+                Assert.assertEquals(sql, "update tb set id = 99, inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' ) ; insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) )");
                 Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
                 Assert.assertEquals(result, 0);
                 result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());

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

@@ -73,18 +73,21 @@ public class SelectiveEnhancedPluginTest {
                 ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
 
                 ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
-                tb.set("incF3", 10l);
-                tb.set("tsIncF2", 5l);
+                tb.set("id", 121L);
+                tb.set("incF3", 10L);
+                tb.set("tsIncF2", 5L);
                 // selective
+                ObjectUtil TbColumnId = new ObjectUtil(loader, packagz + ".Tb$Column#id");
                 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());
+                Object columns = Array.newInstance(TbColumnField1.getCls(), 3);
+                Array.set(columns, 0, TbColumnId.getObject());
+                Array.set(columns, 1, TbColumnField1.getObject());
+                Array.set(columns, 2, TbColumnTsIncF2.getObject());
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject(), columns);
-                Assert.assertEquals(sql, "insert into tb ( field_1 , inc_f2 ) values ( 'null' , 5 )");
+                Assert.assertEquals(sql, "insert into tb ( id , field_1 , inc_f2 ) values ( 121 , 'null' , 5 )");
                 Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
                 Assert.assertEquals(result, 1);
             }

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

@@ -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 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 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, "update tb set field1 = 'ts1', field2 = 5 WHERE ( id = '50' ) ; insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) )");
+                Assert.assertEquals(sql, "update tb set id = 50, field1 = 'ts1', field2 = 5 WHERE ( id = '50' ) ; insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) )");
                 tbMapper.invoke("upsertByExample", tb.getObject(), TbExample.getObject());
 
 
@@ -305,7 +305,7 @@ public class UpsertPluginTest {
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
-                Assert.assertEquals(sql, "update tb set field1 = 'ts1' WHERE ( id = '100' ) ; insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) )");
+                Assert.assertEquals(sql, "update tb set id = 100, field1 = 'ts1' WHERE ( id = '100' ) ; insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) )");
                 tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
 
                 // 2. blobs
@@ -322,9 +322,41 @@ public class UpsertPluginTest {
 
                 // sql
                 sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
-                Assert.assertEquals(sql, "update tb_blobs set field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' ) ; insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) )");
+                Assert.assertEquals(sql, "update tb_blobs set id = 200, field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' ) ; insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) )");
                 TbBlobsMapper.invoke("upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
             }
         });
     }
+
+    /**
+     * 测试 存在自增主键的情况
+     */
+    @Test
+    public void testWithIdentityAndGeneratedAlwaysColumns() throws IOException, XMLParserException, InvalidConfigurationException, InterruptedException, SQLException {
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/UpsertPlugin/mybatis-generator.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 + ".TbWithIncIdMapper")));
+
+                ObjectUtil tb = new ObjectUtil(loader, packagz + ".TbWithIncId");
+                tb.set("field1", "ts1");
+                tb.set("field2", 5);
+
+                // sql
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsert", tb.getObject());
+                Assert.assertEquals(sql, "insert into tb_with_inc_id ( field1, field2 ) values ( 'ts1', 5 ) on duplicate key update field1 = 'ts1', field2 = 5");
+                tbMapper.invoke("upsert", tb.getObject());
+                // 获取ID
+                Long id = (Long) tb.get("id");
+
+                tb.set("field2", 20);
+                tbMapper.invoke("upsert", tb.getObject());
+
+                ResultSet rs = DBHelper.execute(sqlSession, "select * from tb_with_inc_id where id = " + id);
+                rs.first();
+                Assert.assertEquals(rs.getInt("field2"), 20);
+            }
+        });
+    }
 }

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

@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 DROP TABLE IF EXISTS `tb`;
 CREATE TABLE `tb` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `id` bigint(20) NOT NULL COMMENT '注释1',
   `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
   `inc_f1` bigint(20) NOT NULL DEFAULT '0',
   `inc_f2` bigint(20) NOT NULL DEFAULT '0',

src/test/resources/scripts/IncrementsPlugin/mybatis-generator-with-upsert-plugin.xml

@@ -53,8 +53,6 @@
         <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
         <table tableName="tb">
             <property name="incrementsColumns" value="inc_f1"/>
-
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
         <table tableName="tb_keys">
             <property name="incrementsColumns" value="inc_f1,inc_f2,inc_f3"/>

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

@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 DROP TABLE IF EXISTS `tb`;
 CREATE TABLE `tb` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `id` bigint(20) NOT NULL COMMENT '注释1',
   `field_1` varchar(255) DEFAULT NULL COMMENT '注释2',
   `inc_f1` bigint(20) NOT NULL DEFAULT '0',
   `inc_f2` bigint(20) NOT NULL DEFAULT '0',

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

@@ -46,8 +46,6 @@
 
         <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
         <table tableName="tb">
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
-
             <columnOverride column="inc_f2" property="tsIncF2"/>
         </table>
     </context>

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

@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 DROP TABLE IF EXISTS `tb`;
 CREATE TABLE `tb` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `id` bigint(20) NOT NULL COMMENT '注释1',
   `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
   `field2` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
@@ -38,7 +38,7 @@ INSERT INTO `tb` VALUES ('3', 'fd3', '3');
 -- ----------------------------
 DROP TABLE IF EXISTS `tb_blobs`;
 CREATE TABLE `tb_blobs` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `id` bigint(20) NOT NULL COMMENT '注释1',
   `field1` varchar(255) DEFAULT NULL,
   `field2` longtext COMMENT '注释2',
   `field3` longtext,
@@ -54,7 +54,7 @@ CREATE TABLE `tb_blobs` (
 -- ----------------------------
 DROP TABLE IF EXISTS `tb_keys`;
 CREATE TABLE `tb_keys` (
-  `key1` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `key1` bigint(20) NOT NULL COMMENT '注释1',
   `key2` varchar(255) NOT NULL,
   `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
   `field2` int(11) DEFAULT NULL,
@@ -73,7 +73,7 @@ INSERT INTO `tb_keys` VALUES ('3', '4', 'fd2', '3');
 -- ----------------------------
 DROP TABLE IF EXISTS `tb_single_blob`;
 CREATE TABLE `tb_single_blob` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `id` bigint(20) NOT NULL COMMENT '注释1',
   `field1` longtext COMMENT '注释2',
   `field2` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
@@ -82,3 +82,17 @@ CREATE TABLE `tb_single_blob` (
 -- ----------------------------
 -- Records of tb_single_blob
 -- ----------------------------
+
+-- ----------------------------
+-- Table structure for tb_with_inc_id
+-- ----------------------------
+DROP TABLE IF EXISTS `tb_with_inc_id`;
+CREATE TABLE `tb_with_inc_id` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
+  `field1` varchar(255) DEFAULT NULL COMMENT '注释2',
+  `field2` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+-- ----------------------------
+-- Table structure for tb_with_inc_id
+-- ----------------------------
\ No newline at end of file

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

@@ -28,13 +28,13 @@
         </plugin>
 
         <!--jdbc的数据库连接 -->
-        <jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
+        <jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}"/>
         <!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
             targetPackage     指定生成的model生成所在的包名
             targetProject     指定在该项目下所在的路径  -->
         <javaModelGenerator targetPackage="" targetProject=""/>
         <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
-        <sqlMapGenerator targetPackage="" targetProject="" />
+        <sqlMapGenerator targetPackage="" targetProject=""/>
         <!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
             type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
             type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
@@ -42,14 +42,11 @@
         <javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
 
         <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-        <table tableName="tb">
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
-        </table>
-        <table tableName="tb_keys" />
-        <table tableName="tb_single_blob">
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
-        </table>
-        <table tableName="tb_blobs">
+        <table tableName="tb"/>
+        <table tableName="tb_keys"/>
+        <table tableName="tb_single_blob"/>
+        <table tableName="tb_blobs"/>
+        <table tableName="tb_with_inc_id">
             <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
     </context>