EntityHelper的getOrderByClause方法返回值从StringBuilder改为String

abel533 · abel533 · commit e1fb9ef925ad · 2015-05-14T13:46:02.000+08:00
diff --git a/src/main/java/com/github/abel533/entity/CommonProvider.java b/src/main/java/com/github/abel533/entity/CommonProvider.java
@@ -96,9 +96,9 @@ public String select(final Map<String, Object> params) {
                     }
                 }
             }
-            StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
+            String orderByClause = EntityHelper.getOrderByClause(entityClass);
             if (orderByClause.length() > 0) {
-                ORDER_BY(orderByClause.toString());
+                ORDER_BY(orderByClause);
             }
         }}.toString();
     }
@@ -334,7 +334,7 @@ public String selectByExample(final Map<String, Object> params) {
             SELECT(EntityHelper.getAllColumns(entityClass));
             FROM(entityTable.getName());
             applyWhere(this, example);
-            applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass).toString());
+            applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass));
         }}.toString();
     }
 
diff --git a/src/main/java/com/github/abel533/mapper/MapperProvider.java b/src/main/java/com/github/abel533/mapper/MapperProvider.java
@@ -87,9 +87,9 @@ public SqlNode select(MappedStatement ms) {
                 + tableName(entityClass)));
         //将if添加到<where>
         sqlNodes.add(new WhereSqlNode(ms.getConfiguration(), getAllIfColumnNode(entityClass)));
-        StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
+        String orderByClause = EntityHelper.getOrderByClause(entityClass);
         if (orderByClause.length() > 0) {
-            sqlNodes.add(new StaticTextSqlNode(orderByClause.insert(0, "ORDER BY ").toString()));
+            sqlNodes.add(new StaticTextSqlNode("ORDER BY " + orderByClause));
         }
         return new MixedSqlNode(sqlNodes);
     }
@@ -429,9 +429,9 @@ public SqlNode selectByExample(MappedStatement ms) {
         sqlNodes.add(ifNullSqlNode);
         IfSqlNode orderByClauseSqlNode = new IfSqlNode(new TextSqlNode("order by ${orderByClause}"), "orderByClause != null");
         sqlNodes.add(orderByClauseSqlNode);
-        StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
+        String orderByClause = EntityHelper.getOrderByClause(entityClass);
         if (orderByClause.length() > 0) {
-            IfSqlNode defaultOrderByClauseSqlNode = new IfSqlNode(new StaticTextSqlNode(orderByClause.insert(0, "ORDER BY ").toString()), "orderByClause == null");
+            IfSqlNode defaultOrderByClauseSqlNode = new IfSqlNode(new StaticTextSqlNode("ORDER BY " + orderByClause), "orderByClause == null");
             sqlNodes.add(defaultOrderByClauseSqlNode);
         }
         return new MixedSqlNode(sqlNodes);
diff --git a/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java b/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java
@@ -49,7 +49,7 @@ public static class EntityTable {
         private String name;
         private String catalog;
         private String schema;
-        private StringBuilder orderByClause;
+        private String orderByClause;
         //实体类 => 全部列属性
         private Set<EntityColumn> entityClassColumns;
         //实体类 => 主键信息
@@ -249,7 +249,7 @@ public static EntityTable getEntityTable(Class<?> entityClass) {
      * @param entityClass
      * @return
      */
-    public static StringBuilder getOrderByClause(Class<?> entityClass) {
+    public static String getOrderByClause(Class<?> entityClass) {
         EntityTable table = getEntityTable(entityClass);
         if (table.orderByClause != null) {
             return table.orderByClause;
@@ -263,7 +263,7 @@ public static StringBuilder getOrderByClause(Class<?> entityClass) {
                 orderBy.append(column.getColumn()).append(" ").append(column.getOrderBy());
             }
         }
-        table.orderByClause = orderBy;
+        table.orderByClause = orderBy.toString();
         return table.orderByClause;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ public String select(final Map<String, Object> params) {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`
`99`		`- StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);`
	`99`	`+ String orderByClause = EntityHelper.getOrderByClause(entityClass);`
`100`	`100`	`if (orderByClause.length() > 0) {`
`101`		`- ORDER_BY(orderByClause.toString());`
	`101`	`+ ORDER_BY(orderByClause);`
`102`	`102`	`}`
`103`	`103`	`}}.toString();`
`104`	`104`	`}`
`@@ -334,7 +334,7 @@ public String selectByExample(final Map<String, Object> params) {`
`334`	`334`	`SELECT(EntityHelper.getAllColumns(entityClass));`
`335`	`335`	`FROM(entityTable.getName());`
`336`	`336`	`applyWhere(this, example);`
`337`		`- applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass).toString());`
	`337`	`+ applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass));`
`338`	`338`	`}}.toString();`
`339`	`339`	`}`
`340`	`340`