完善skipId判断

abel533 · abel533 · commit a671a071c123 · 2015-12-07T23:32:10.000+08:00
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java
@@ -339,12 +339,13 @@ public static String insertColumns(Class<?> entityClass, boolean skipId, boolean
         Set<EntityColumn> columnList = EntityHelper.getColumns(entityClass);
         //当某个列有主键策略时，不需要考虑他的属性是否为空，因为如果为空，一定会根据主键策略给他生成一个值
         for (EntityColumn column : columnList) {
-            if (skipId && !column.isId()) {
-                if (notNull) {
-                    sql.append(SqlHelper.getIfNotNull(column, column.getColumn() + ",", notEmpty));
-                } else {
-                    sql.append(column.getColumn() + ",");
-                }
+            if (skipId && column.isId()) {
+                continue;
+            }
+            if (notNull) {
+                sql.append(SqlHelper.getIfNotNull(column, column.getColumn() + ",", notEmpty));
+            } else {
+                sql.append(column.getColumn() + ",");
             }
         }
         sql.append("</trim>");
@@ -367,12 +368,13 @@ public static String insertValuesColumns(Class<?> entityClass, boolean skipId, b
         Set<EntityColumn> columnList = EntityHelper.getColumns(entityClass);
         //当某个列有主键策略时，不需要考虑他的属性是否为空，因为如果为空，一定会根据主键策略给他生成一个值
         for (EntityColumn column : columnList) {
-            if (skipId && !column.isId()) {
-                if (notNull) {
-                    sql.append(SqlHelper.getIfNotNull(column, column.getColumnHolder() + ",", notEmpty));
-                } else {
-                    sql.append(column.getColumnHolder() + ",");
-                }
+            if (skipId && column.isId()) {
+                continue;
+            }
+            if (notNull) {
+                sql.append(SqlHelper.getIfNotNull(column, column.getColumnHolder() + ",", notEmpty));
+            } else {
+                sql.append(column.getColumnHolder() + ",");
             }
         }
         sql.append("</trim>");
@@ -475,7 +477,7 @@ public static String exampleSelectColumns(Class<?> entityClass) {
         sql.append("</if>");
         //不支持指定列的时候查询全部列
         sql.append("<if test=\"@tk.mybatis.mapper.util.OGNL@hasNoSelectColumns(_parameter)\">");
-        sql.append(SqlHelper.getAllColumns(entityClass));
+        sql.append(getAllColumns(entityClass));
         sql.append("</if>");
         return sql.toString();
     }
diff --git a/src/main/java/tk/mybatis/mapper/provider/base/BaseInsertProvider.java b/src/main/java/tk/mybatis/mapper/provider/base/BaseInsertProvider.java
@@ -95,11 +95,8 @@ public String insert(MappedStatement ms) {
                 sql.append(SqlHelper.getBindValue(column, getUUID()));
             }
         }
-        sql.append("INSERT INTO ");
-        sql.append(SqlHelper.getDynamicTableName(entityClass, tableName(entityClass)));
-        sql.append("(");
-        sql.append(SqlHelper.getAllColumns(entityClass));
-        sql.append(") ");
+        sql.append(SqlHelper.insertIntoTable(entityClass, tableName(entityClass)));
+        sql.append(SqlHelper.insertColumns(entityClass, false, false, false));
         sql.append("<trim prefix=\"VALUES(\" suffix=\")\" suffixOverrides=\",\">");
         for (EntityColumn column : columnList) {
             //优先使用传入的属性值,当原属性property!=null时，用原属性
@@ -183,8 +180,7 @@ public String insertSelective(MappedStatement ms) {
                 sql.append(SqlHelper.getBindValue(column, getUUID()));
             }
         }
-        sql.append("INSERT INTO ");
-        sql.append(SqlHelper.getDynamicTableName(entityClass, tableName(entityClass)));
+        sql.append(SqlHelper.insertIntoTable(entityClass, tableName(entityClass)));
         sql.append("<trim prefix=\"(\" suffix=\")\" suffixOverrides=\",\">");
         for (EntityColumn column : columnList) {
             if (StringUtil.isNotEmpty(column.getSequenceName()) || column.isIdentity() || column.isUuid()) {
diff --git a/src/test/java/tk/mybatis/mapper/mapper/MybatisHelper.java b/src/test/java/tk/mybatis/mapper/mapper/MybatisHelper.java
@@ -71,6 +71,7 @@ public class MybatisHelper {
                 // 支持方法上的注解
                 // 3.3.1版本增加
                 config.setEnableMethodAnnotation(true);
+                //config.setNotEmpty(true);
                 // 序列的获取规则,使用{num}格式化参数，默认值为{0}.nextval，针对Oracle
                 // 可选参数一共3个，对应0,1,2,分别为SequenceName，ColumnName, PropertyName
                 //config.setSeqFormat("NEXT VALUE FOR {0}");

Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,8 @@ public String insert(MappedStatement ms) {`
`95`	`95`	`sql.append(SqlHelper.getBindValue(column, getUUID()));`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`- sql.append("INSERT INTO ");`
`99`		`- sql.append(SqlHelper.getDynamicTableName(entityClass, tableName(entityClass)));`
`100`		`- sql.append("(");`
`101`		`- sql.append(SqlHelper.getAllColumns(entityClass));`
`102`		`- sql.append(") ");`
	`98`	`+ sql.append(SqlHelper.insertIntoTable(entityClass, tableName(entityClass)));`
	`99`	`+ sql.append(SqlHelper.insertColumns(entityClass, false, false, false));`
`103`	`100`	`sql.append("<trim prefix=\"VALUES(\" suffix=\")\" suffixOverrides=\",\">");`
`104`	`101`	`for (EntityColumn column : columnList) {`
`105`	`102`	`//优先使用传入的属性值,当原属性property!=null时，用原属性`
`@@ -183,8 +180,7 @@ public String insertSelective(MappedStatement ms) {`
`183`	`180`	`sql.append(SqlHelper.getBindValue(column, getUUID()));`
`184`	`181`	`}`
`185`	`182`	`}`
`186`		`- sql.append("INSERT INTO ");`
`187`		`- sql.append(SqlHelper.getDynamicTableName(entityClass, tableName(entityClass)));`
	`183`	`+ sql.append(SqlHelper.insertIntoTable(entityClass, tableName(entityClass)));`
`188`	`184`	`sql.append("<trim prefix=\"(\" suffix=\")\" suffixOverrides=\",\">");`
`189`	`185`	`for (EntityColumn column : columnList) {`
`190`	`186`	`if (StringUtil.isNotEmpty(column.getSequenceName()) \|\| column.isIdentity() \|\| column.isUuid()) {`