完善所有和PrimaryKey有关的通用查询

abel533 · abel533 · commit 300ad036b6e9 · 2015-04-07T14:32:25.000+08:00
diff --git a/README.md b/README.md
@@ -86,6 +86,10 @@ Country代码：
 
 ##Maven坐标以及下载地址
 
+###开发版2.3.1-SNAPSHOT - 2015-04-07
+
+* 完善所有和PrimaryKey有关的通用查询
+
 ###最新版本2.3.0 - 2015-04-05
 
 * Mapper接口和EntityMapper都增加了`selectOne`方法，该查询返回值最多只能有一个，存在多个时抛出异常
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.github.abel533</groupId>
   <artifactId>mapper</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>mapper</name>
diff --git a/src/main/java/com/github/abel533/mapper/MapperProvider.java b/src/main/java/com/github/abel533/mapper/MapperProvider.java
@@ -312,30 +312,31 @@ public void deleteByPrimaryKey(MappedStatement ms) {
      *
      * @param ms
      */
-    public void updateByPrimaryKey(MappedStatement ms) {
-        final Class<?> entityClass = getSelectReturnType(ms);
-        //映射要包含set=?和where=?
-        //获取set映射
-        List<ParameterMapping> parameterMappings = getColumnParameterMappings(ms);
-        //获取where主键映射
-        parameterMappings.addAll(getPrimaryKeyParameterMappings(ms));
-        //开始拼sql
-        String sql = new SQL() {{
-            //update table
-            UPDATE(tableName(entityClass));
-            //获取全部列
-            Set<EntityHelper.EntityColumn> columnList = EntityHelper.getColumns(entityClass);
-            //拼所有的set column = ?
-            for (EntityHelper.EntityColumn column : columnList) {
-                SET(column.getColumn() + " = ?");
+    public SqlNode updateByPrimaryKey(MappedStatement ms) {
+        Class<?> entityClass = getSelectReturnType(ms);
+        List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
+        //update table
+        sqlNodes.add(new StaticTextSqlNode("UPDATE " + tableName(entityClass)));
+        //获取全部列
+        Set<EntityHelper.EntityColumn> columnList = EntityHelper.getColumns(entityClass);
+        List<SqlNode> ifNodes = new ArrayList<SqlNode>();
+        for (EntityHelper.EntityColumn column : columnList) {
+            if (!column.isId()) {
+                ifNodes.add(new StaticTextSqlNode(column.getColumn() + " = #{" + column.getProperty() + "}, "));
             }
-            //where 主键=#{property} 条件
-            WHERE(EntityHelper.getPrimaryKeyWhere(entityClass));
-        }}.toString();
-        //静态SqlSource
-        StaticSqlSource sqlSource = new StaticSqlSource(ms.getConfiguration(), sql, parameterMappings);
-        //替换原有的SqlSource
-        setSqlSource(ms, sqlSource);
+        }
+        sqlNodes.add(new SetSqlNode(ms.getConfiguration(), new MixedSqlNode(ifNodes)));
+        //获取全部的主键的列
+        columnList = EntityHelper.getPKColumns(entityClass);
+        List<SqlNode> whereNodes = new ArrayList<SqlNode>();
+        boolean first = true;
+        //where 主键=#{property} 条件
+        for (EntityHelper.EntityColumn column : columnList) {
+            whereNodes.add(getColumnEqualsProperty(column, first));
+            first = false;
+        }
+        sqlNodes.add(new WhereSqlNode(ms.getConfiguration(), new MixedSqlNode(whereNodes)));
+        return new MixedSqlNode(sqlNodes);
     }
 
     /**
@@ -354,8 +355,10 @@ public SqlNode updateByPrimaryKeySelective(MappedStatement ms) {
         List<SqlNode> ifNodes = new ArrayList<SqlNode>();
         //全部的if property!=null and property!=''
         for (EntityHelper.EntityColumn column : columnList) {
-            StaticTextSqlNode columnNode = new StaticTextSqlNode(column.getColumn() + " = #{" + column.getProperty() + "}, ");
-            ifNodes.add(getIfNotNull(column, columnNode));
+            if (!column.isId()) {
+                StaticTextSqlNode columnNode = new StaticTextSqlNode(column.getColumn() + " = #{" + column.getProperty() + "}, ");
+                ifNodes.add(getIfNotNull(column, columnNode));
+            }
         }
         sqlNodes.add(new SetSqlNode(ms.getConfiguration(), new MixedSqlNode(ifNodes)));
         //获取全部的主键的列
@@ -450,8 +453,10 @@ public SqlNode updateByExampleSelective(MappedStatement ms) {
         List<SqlNode> ifNodes = new ArrayList<SqlNode>();
 
         for (EntityHelper.EntityColumn column : columnList) {
-            StaticTextSqlNode columnNode = new StaticTextSqlNode(column.getColumn() + " = #{record." + column.getProperty() + "}, ");
-            ifNodes.add(new IfSqlNode(columnNode, "record." + column.getProperty() + " != null"));
+            if (!column.isId()) {
+                StaticTextSqlNode columnNode = new StaticTextSqlNode(column.getColumn() + " = #{record." + column.getProperty() + "}, ");
+                ifNodes.add(new IfSqlNode(columnNode, "record." + column.getProperty() + " != null"));
+            }
         }
         sqlNodes.add(new SetSqlNode(ms.getConfiguration(), new MixedSqlNode(ifNodes)));
         //Example的Where
@@ -476,7 +481,9 @@ public SqlNode updateByExample(MappedStatement ms) {
         List<SqlNode> setSqlNodes = new ArrayList<SqlNode>();
         //全部的if property!=null and property!=''
         for (EntityHelper.EntityColumn column : columnList) {
-            setSqlNodes.add(new StaticTextSqlNode(column.getColumn() + " = #{record." + column.getProperty() + "}, "));
+            if (!column.isId()) {
+                setSqlNodes.add(new StaticTextSqlNode(column.getColumn() + " = #{record." + column.getProperty() + "}, "));
+            }
         }
         sqlNodes.add(new SetSqlNode(ms.getConfiguration(), new MixedSqlNode(setSqlNodes)));
         //Example的Where
diff --git a/src/test/java/com/github/abel533/test/user/TestBasic.java b/src/test/java/com/github/abel533/test/user/TestBasic.java
@@ -49,6 +49,7 @@ public void testInsert() {
 
             Assert.assertEquals(1,mapper.deleteByPrimaryKey(userInfo));
         } finally {
+            sqlSession.rollback();
             sqlSession.close();
         }
     }
@@ -76,6 +77,7 @@ public void testDelete() {
             //插入
             Assert.assertEquals(1, mapper.insert(userInfo));
         } finally {
+            sqlSession.rollback();
             sqlSession.close();
         }
     }
@@ -117,6 +119,7 @@ public void testUpdateByPrimaryKey() {
             Assert.assertNull(userInfo.getUsertype());
             Assert.assertEquals("abel533@gmail.com", userInfo.getEmail());
         } finally {
+            sqlSession.rollback();
             sqlSession.close();
         }
     }
@@ -140,6 +143,7 @@ public void testUpdateByPrimaryKeySelective() {
             Assert.assertEquals("1", userInfo.getUsertype());
             Assert.assertEquals("abel533@gmail.com", userInfo.getEmail());
         } finally {
+            sqlSession.rollback();
             sqlSession.close();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public void testInsert() {`
`49`	`49`
`50`	`50`	`Assert.assertEquals(1,mapper.deleteByPrimaryKey(userInfo));`
`51`	`51`	`} finally {`
	`52`	`+ sqlSession.rollback();`
`52`	`53`	`sqlSession.close();`
`53`	`54`	`}`
`54`	`55`	`}`
`@@ -76,6 +77,7 @@ public void testDelete() {`
`76`	`77`	`//插入`
`77`	`78`	`Assert.assertEquals(1, mapper.insert(userInfo));`
`78`	`79`	`} finally {`
	`80`	`+ sqlSession.rollback();`
`79`	`81`	`sqlSession.close();`
`80`	`82`	`}`
`81`	`83`	`}`
`@@ -117,6 +119,7 @@ public void testUpdateByPrimaryKey() {`
`117`	`119`	`Assert.assertNull(userInfo.getUsertype());`
`118`	`120`	`Assert.assertEquals("[email protected]", userInfo.getEmail());`
`119`	`121`	`} finally {`
	`122`	`+ sqlSession.rollback();`
`120`	`123`	`sqlSession.close();`
`121`	`124`	`}`
`122`	`125`	`}`
`@@ -140,6 +143,7 @@ public void testUpdateByPrimaryKeySelective() {`
`140`	`143`	`Assert.assertEquals("1", userInfo.getUsertype());`
`141`	`144`	`Assert.assertEquals("[email protected]", userInfo.getEmail());`
`142`	`145`	`} finally {`
	`146`	`+ sqlSession.rollback();`
`143`	`147`	`sqlSession.close();`
`144`	`148`	`}`
`145`	`149`	`}`