upsert获取自增主键返回测试用例补充

Author: hewei

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

@@ -82,7 +82,7 @@ public void reloadProject(SqlSession sqlSession, ClassLoader loader, String pack
 
                 // 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);
 
@@ -92,6 +92,11 @@ public void reloadProject(SqlSession sqlSession, ClassLoader loader, String pack
                 ResultSet rs = DBHelper.execute(sqlSession, "select * from tb where id = 10");
                 rs.first();
                 Assert.assertEquals(rs.getInt("field2"), 20);
+
+                // 自增主键
+                tb.set("id", null);
+                tbMapper.invoke("upsert", tb.getObject());
+                Assert.assertEquals(tb.get("id"), 11L);
             }
         });
     }
@@ -172,6 +177,11 @@ public void reloadProject(SqlSession sqlSession, ClassLoader loader, String pack
                 Object result = tbMapper.invoke("upsertSelective", tb.getObject());
                 Assert.assertEquals(result, 1);
 
+                // 自增主键
+                tb.set("id", null);
+                tbMapper.invoke("upsertSelective", tb.getObject());
+                Assert.assertEquals(tb.get("id"), 21L);
+
                 // 2. blobs
                 ObjectUtil TbBlobsMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbBlobsMapper")));
 
@@ -211,7 +221,7 @@ public void reloadProject(SqlSession sqlSession, ClassLoader loader, String pack
 
                 // sql
                 String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tb.getObject(), TbExample.getObject());
-                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' ) )");
+                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());
 
 

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

@@ -20,11 +20,11 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 DROP TABLE IF EXISTS `tb`;
 CREATE TABLE `tb` (
-  `id` bigint(20) NOT NULL COMMENT '注释1',
+  `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=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of tb

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

@@ -42,7 +42,9 @@
         <javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
 
         <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-        <table tableName="tb"/>
+        <table tableName="tb">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+        </table>
         <table tableName="tb_keys"/>
         <table tableName="tb_single_blob"/>
         <table tableName="tb_blobs"/>