乐观锁插件实现

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

@@ -50,33 +50,27 @@ public class XmlElementGeneratorTools {
      * @return the selectKey element
      */
     public static Element getSelectKey(IntrospectedColumn introspectedColumn, GeneratedKey generatedKey) {
-        String identityColumnType = introspectedColumn
-                .getFullyQualifiedJavaType().getFullyQualifiedName();
+        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("order",
-                generatedKey.getMyBatis3Order()));
+        answer.addAttribute(new Attribute("keyProperty", introspectedColumn.getJavaProperty()));
+        answer.addAttribute(new Attribute("order", generatedKey.getMyBatis3Order()));
 
-        answer.addElement(new TextElement(generatedKey
-                .getRuntimeSqlStatement()));
+        answer.addElement(new TextElement(generatedKey.getRuntimeSqlStatement()));
 
         return answer;
     }
 
     public static Element getBaseColumnListElement(IntrospectedTable introspectedTable) {
         XmlElement answer = new XmlElement("include");
-        answer.addAttribute(new Attribute("refid",
-                introspectedTable.getBaseColumnListId()));
+        answer.addAttribute(new Attribute("refid", introspectedTable.getBaseColumnListId()));
         return answer;
     }
 
     public static Element getBlobColumnListElement(IntrospectedTable introspectedTable) {
         XmlElement answer = new XmlElement("include");
-        answer.addAttribute(new Attribute("refid",
-                introspectedTable.getBlobColumnListId()));
+        answer.addAttribute(new Attribute("refid", introspectedTable.getBlobColumnListId()));
         return answer;
     }
 
@@ -85,8 +79,7 @@ public class XmlElementGeneratorTools {
         ifElement.addAttribute(new Attribute("test", "_parameter != null"));
 
         XmlElement includeElement = new XmlElement("include");
-        includeElement.addAttribute(new Attribute("refid",
-                introspectedTable.getExampleWhereClauseId()));
+        includeElement.addAttribute(new Attribute("refid", introspectedTable.getExampleWhereClauseId()));
         ifElement.addElement(includeElement);
 
         return ifElement;
@@ -97,8 +90,7 @@ public class XmlElementGeneratorTools {
         ifElement.addAttribute(new Attribute("test", "_parameter != null"));
 
         XmlElement includeElement = new XmlElement("include");
-        includeElement.addAttribute(new Attribute("refid",
-                introspectedTable.getMyBatis3UpdateByExampleWhereClauseId()));
+        includeElement.addAttribute(new Attribute("refid", introspectedTable.getMyBatis3UpdateByExampleWhereClauseId()));
         ifElement.addElement(includeElement);
 
         return ifElement;
@@ -270,18 +262,7 @@ public class XmlElementGeneratorTools {
      * @return
      */
     public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
-        return generateSets(columns, prefix, false);
-    }
-
-    /**
-     * 生成sets Ele
-     * @param columns
-     * @param prefix
-     * @param bracket
-     * @return
-     */
-    public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
-        return generateCommColumns(columns, prefix, bracket, 3);
+        return generateCommColumns(columns, prefix, false, 3);
     }
 
     /**
@@ -290,7 +271,7 @@ public class XmlElementGeneratorTools {
      * @return
      */
     public static XmlElement generateSetsSelective(List<IntrospectedColumn> columns) {
-        return generateSetsSelective(columns, null, false);
+        return generateSetsSelective(columns, null);
     }
 
     /**
@@ -300,18 +281,7 @@ public class XmlElementGeneratorTools {
      * @return
      */
     public static XmlElement generateSetsSelective(List<IntrospectedColumn> columns, String prefix) {
-        return generateSetsSelective(columns, prefix, false);
-    }
-
-    /**
-     * 生成sets Selective Ele
-     * @param columns
-     * @param prefix
-     * @param bracket
-     * @return
-     */
-    public static XmlElement generateSetsSelective(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
-        return generateCommColumnsSelective(columns, prefix, bracket, 3);
+        return generateCommColumnsSelective(columns, prefix, false, 3);
     }
 
     /**
@@ -325,6 +295,7 @@ public class XmlElementGeneratorTools {
     private static List<Element> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
         List<Element> list = new ArrayList<>();
 
+        // 只有upsert插件才会传入 IdentityAndGeneratedAlwaysColumn
         if (hasIdentityAndGeneratedAlwaysColumns(columns)) {
             XmlElement trimEle = generateTrim(bracket);
 

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

@@ -47,8 +47,28 @@ public class OptimisticLockerPluginTest {
      */
     @Test
     public void testUpdateWithVersionByExampleSelective() throws Exception {
+        // 测试不带or的更新
         MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/OptimisticLockerPlugin/mybatis-generator.xml");
-        tool.generate(new AbstractShellCallback() {
+        tool.generate(() -> DBHelper.createDB("scripts/OptimisticLockerPlugin/init.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 tbExample = new ObjectUtil(loader, packagz + ".TbExample");
+                ObjectUtil criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
+                criteria.invoke("andIdEqualTo", 1l);
+
+                ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
+                tb.set("incF2", 10L);
+                tb.set("incF3", 5L);
+
+                // sql
+                String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateWithVersionByExample", 1L, tb.getObject(), tbExample.getObject());
+                Assert.assertEquals(sql, "update tb SET field_1 = 'null' , inc_f2 = 5 WHERE ( id = '1' )");
+            }
+        });
+
+        tool.generate(() -> DBHelper.createDB("scripts/OptimisticLockerPlugin/init.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")));

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

@@ -20,7 +20,7 @@ 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',
   `inc_f1` bigint(20) NOT NULL DEFAULT '0',
   `inc_f2` bigint(20) DEFAULT '0',

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

@@ -53,9 +53,13 @@
         </table>
         <table tableName="tb_keys">
             <property name="versionColumn" value="inc_f1"/>
+
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
         <table tableName="tb_blobs">
             <property name="versionColumn" value="inc_f1"/>
+
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
     </context>
 </generatorConfiguration>
\ No newline at end of file