Merge branch 'develop'

abel533 · abel533 · commit 3fb4ab18c87b · 2016-02-16T20:17:56.000+08:00
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ Country代码：
 <dependency>
     <groupId>tk.mybatis</groupId>
     <artifactId>mapper</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
 </dependency>
 ```
 
@@ -108,7 +108,13 @@ http://repo1.maven.org/maven2/javax/persistence/persistence-api/1.0/
 
 ##[更新日志](http://git.oschina.net/free/Mapper/blob/master/wiki/Changelog.md)
 
-##最新版本3.3.4 - 2016-01-05
+##最新版本3.3.5 - 2016-02-16
+
+* `Example`增加对动态表名支持，通过`setTableName`设置表名
+* 在example相关的两个`update`方法中，参数为实体类和`Example`，这个方法只能通过`Example`来设置动态表名，不支持通过实体设置动态表名
+* 优化两个`select count`查询，当表只有一个主键的时候，使用`select count(pk)`，其他时候使用`select count(*)`
+
+###3.3.4 - 2016-01-05
 
 * 解决insertList的bug#86
 * `Example`构造方法增加`notNull`参数，默认`false`，允许值为`null`，值为`null`的时候不加入到条件中。
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>tk.mybatis</groupId>
     <artifactId>mapper</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
     <packaging>jar</packaging>
 
     <name>mapper</name>
diff --git a/src/main/java/tk/mybatis/mapper/entity/Example.java b/src/main/java/tk/mybatis/mapper/entity/Example.java
@@ -36,7 +36,7 @@
  *
  * @author liuzh
  */
-public class Example {
+public class Example implements IDynamicTableName {
     protected String orderByClause;
 
     protected boolean distinct;
@@ -54,7 +54,8 @@ public class Example {
     protected EntityTable table;
     //属性和列对应
     protected Map<String, EntityColumn> propertyMap;
-
+    //动态表名
+    protected String tableName;
     /**
      * 默认exists为true
      *
@@ -170,6 +171,20 @@ public void clear() {
         distinct = false;
     }
 
+    /**
+     * 设置表名
+     *
+     * @param tableName
+     */
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    @Override
+    public String getDynamicTableName() {
+        return tableName;
+    }
+
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
         //字段是否必须存在
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java
@@ -251,6 +251,24 @@ public static String selectAllColumns(Class<?> entityClass) {
         return sql.toString();
     }
 
+    /**
+     * select count(x)
+     *
+     * @param entityClass
+     * @return
+     */
+    public static String selectCount(Class<?> entityClass) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT ");
+        Set<EntityColumn> pkColumns = EntityHelper.getPKColumns(entityClass);
+        if (pkColumns.size() == 1) {
+            sql.append("COUNT(").append(pkColumns.iterator().next().getColumn()).append(") ");
+        } else {
+            sql.append("COUNT(*) ");
+        }
+        return sql.toString();
+    }
+
     /**
      * from tableName - 动态表名
      *
diff --git a/src/main/java/tk/mybatis/mapper/provider/ExampleProvider.java b/src/main/java/tk/mybatis/mapper/provider/ExampleProvider.java
@@ -48,8 +48,9 @@ public ExampleProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
      */
     public String selectCountByExample(MappedStatement ms) {
         Class<?> entityClass = getEntityClass(ms);
-        StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM ");
-        sql.append(SqlHelper.getDynamicTableName(entityClass, tableName(entityClass)));
+        StringBuilder sql = new StringBuilder();
+        sql.append(SqlHelper.selectCount(entityClass));
+        sql.append(SqlHelper.fromTable(entityClass, tableName(entityClass)));
         sql.append(SqlHelper.exampleWhereClause());
         return sql.toString();
     }
@@ -108,7 +109,7 @@ public String selectByExampleAndRowBounds(MappedStatement ms) {
     public String updateByExampleSelective(MappedStatement ms) {
         Class<?> entityClass = getEntityClass(ms);
         StringBuilder sql = new StringBuilder();
-        sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "record"));
+        sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));
         sql.append(SqlHelper.updateSetColumns(entityClass, "record", true, isNotEmpty()));
         sql.append(SqlHelper.updateByExampleWhereClause());
         return sql.toString();
@@ -123,7 +124,7 @@ public String updateByExampleSelective(MappedStatement ms) {
     public String updateByExample(MappedStatement ms) {
         Class<?> entityClass = getEntityClass(ms);
         StringBuilder sql = new StringBuilder();
-        sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "record"));
+        sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));
         sql.append(SqlHelper.updateSetColumns(entityClass, "record", false, false));
         sql.append(SqlHelper.updateByExampleWhereClause());
         return sql.toString();
diff --git a/src/main/java/tk/mybatis/mapper/provider/base/BaseSelectProvider.java b/src/main/java/tk/mybatis/mapper/provider/base/BaseSelectProvider.java
@@ -110,7 +110,7 @@ public String selectByPrimaryKey(MappedStatement ms) {
     public String selectCount(MappedStatement ms) {
         Class<?> entityClass = getEntityClass(ms);
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT COUNT(*) ");
+        sql.append(SqlHelper.selectCount(entityClass));
         sql.append(SqlHelper.fromTable(entityClass, tableName(entityClass)));
         sql.append(SqlHelper.whereAllIfColumns(entityClass, isNotEmpty()));
         return sql.toString();
diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -1,5 +1,11 @@
 #更新日志
 
+##3.3.5 - 2016-02-16
+
+* `Example`增加对动态表名支持，通过`setTableName`设置表名
+* 在example相关的两个`update`方法中，参数为实体类和`Example`，这个方法只能通过`Example`来设置动态表名，不支持通过实体设置动态表名
+* 优化两个`select count`查询，当表只有一个主键的时候，使用`select count(pk)`，其他时候使用`select count(*)`
+
 ##3.3.4 - 2016-01-05
 
 * 解决insertList的bug#86
