Fixed a bug that occurred when the update columns was empty in AutoBatchUpdateQuery (#1037)

Author: momosetkn

doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java

@@ -37,7 +37,7 @@ public void prepare() {
       return;
     }
     executable = true;
-    executionSkipCause = null;
+    sqlExecutionSkipCause = null;
     currentEntity = entities.get(0);
     preDelete();
     prepareIdAndVersionPropertyTypes();

doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java

@@ -52,7 +52,7 @@ public void prepare() {
       return;
     }
     executable = true;
-    executionSkipCause = null;
+    sqlExecutionSkipCause = null;
     currentEntity = entities.get(0);
     preInsert();
     prepareIdAndVersionPropertyTypes();

doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchModifyQuery.java

@@ -40,7 +40,7 @@ public abstract class AutoBatchModifyQuery<ENTITY> extends AbstractQuery
 
   protected boolean executable;
 
-  protected SqlExecutionSkipCause executionSkipCause =
+  protected SqlExecutionSkipCause sqlExecutionSkipCause =
       SqlExecutionSkipCause.BATCH_TARGET_NONEXISTENT;
 
   protected List<PreparedSql> sqls;
@@ -164,7 +164,7 @@ public boolean isExecutable() {
 
   @Override
   public SqlExecutionSkipCause getSqlExecutionSkipCause() {
-    return executionSkipCause;
+    return sqlExecutionSkipCause;
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java

@@ -38,8 +38,6 @@ public void prepare() {
     if (size == 0) {
       return;
     }
-    executable = true;
-    executionSkipCause = null;
     currentEntity = entities.get(0);
     setupHelper();
     preUpdate();
@@ -89,6 +87,10 @@ protected void prepareOptimisticLock() {
 
   protected void prepareTargetPropertyTypes() {
     targetPropertyTypes = helper.getTargetPropertyTypes();
+    if (!targetPropertyTypes.isEmpty()) {
+      executable = true;
+      sqlExecutionSkipCause = null;
+    }
   }
 
   protected void prepareSql() {

integration-test-java/src/main/java/org/seasar/doma/it/entity/IdColumnOnlyEmployee.java

@@ -0,0 +1,117 @@
+package org.seasar.doma.it.entity;
+
+import org.seasar.doma.Entity;
+import org.seasar.doma.Id;
+import org.seasar.doma.Metamodel;
+import org.seasar.doma.OriginalStates;
+import org.seasar.doma.Table;
+import org.seasar.doma.Transient;
+import org.seasar.doma.it.domain.Identity;
+import org.seasar.doma.it.domain.Salary;
+
+@Entity(metamodel = @Metamodel)
+@Table(name = "EMPLOYEE")
+public class IdColumnOnlyEmployee {
+
+  @Id private Integer employeeId;
+
+  @Id private Integer employeeNo;
+
+  @Id private String employeeName;
+
+  @Id private Integer managerId;
+
+  @Id private java.sql.Date hiredate;
+
+  @Id private Salary salary;
+
+  @Id private Identity<Department> departmentId;
+
+  @Id private Integer addressId;
+
+  @Id private Integer version;
+
+  @OriginalStates private IdColumnOnlyEmployee originalStates;
+
+  @Transient Department department;
+
+  public Integer getEmployeeId() {
+    return employeeId;
+  }
+
+  public void setEmployeeId(Integer employee_id) {
+    this.employeeId = employee_id;
+  }
+
+  public Integer getEmployeeNo() {
+    return employeeNo;
+  }
+
+  public void setEmployeeNo(Integer employeeNo) {
+    this.employeeNo = employeeNo;
+  }
+
+  public String getEmployeeName() {
+    return employeeName;
+  }
+
+  public void setEmployeeName(String employeeName) {
+    this.employeeName = employeeName;
+  }
+
+  public Integer getManagerId() {
+    return managerId;
+  }
+
+  public void setManagerId(Integer managerId) {
+    this.managerId = managerId;
+  }
+
+  public java.sql.Date getHiredate() {
+    return hiredate;
+  }
+
+  public void setHiredate(java.sql.Date hiredate) {
+    this.hiredate = hiredate;
+  }
+
+  public Salary getSalary() {
+    return salary;
+  }
+
+  public void setSalary(Salary salary) {
+    this.salary = salary;
+  }
+
+  public Identity<Department> getDepartmentId() {
+    return departmentId;
+  }
+
+  public void setDepartmentId(Identity<Department> departmentId) {
+    this.departmentId = departmentId;
+  }
+
+  public Integer getAddressId() {
+    return addressId;
+  }
+
+  public void setAddressId(Integer addressId) {
+    this.addressId = addressId;
+  }
+
+  public Integer getVersion() {
+    return version;
+  }
+
+  public void setVersion(Integer version) {
+    this.version = version;
+  }
+
+  public Department getDepartment() {
+    return department;
+  }
+
+  public void setDepartment(Department department) {
+    this.department = department;
+  }
+}

integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlBatchUpdateTest.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.seasar.doma.it.IntegrationTestEnvironment;
+import org.seasar.doma.it.entity.IdColumnOnlyEmployee;
+import org.seasar.doma.it.entity.IdColumnOnlyEmployee_;
 import org.seasar.doma.jdbc.BatchResult;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.criteria.Entityql;
@@ -67,4 +69,16 @@ void empty() {
     BatchResult<Employee> result = entityql.update(e, Collections.emptyList()).execute();
     assertTrue(result.getEntities().isEmpty());
   }
+
+  @Test
+  void idColumnOnlyEntity() {
+    IdColumnOnlyEmployee_ e = new IdColumnOnlyEmployee_();
+
+    IdColumnOnlyEmployee employee = entityql.from(e).where(c -> c.eq(e.employeeId, 5)).fetchOne();
+
+    List<IdColumnOnlyEmployee> employeesList = Collections.singletonList(employee);
+    BatchResult<IdColumnOnlyEmployee> result = entityql.update(e, employeesList).execute();
+    assertEquals(employeesList, result.getEntities());
+    assertEquals(0, result.getCounts().length);
+  }
 }

integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlUpdateTest.java

@@ -7,6 +7,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.seasar.doma.it.IntegrationTestEnvironment;
+import org.seasar.doma.it.entity.IdColumnOnlyEmployee;
+import org.seasar.doma.it.entity.IdColumnOnlyEmployee_;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.Result;
 import org.seasar.doma.jdbc.criteria.Entityql;
@@ -52,4 +54,15 @@ void suppressOptimisticLockException() {
             .execute();
     assertEquals(0, result.getCount());
   }
+
+  @Test
+  void idColumnOnlyEntity() {
+    IdColumnOnlyEmployee_ e = new IdColumnOnlyEmployee_();
+
+    IdColumnOnlyEmployee employee = entityql.from(e).where(c -> c.eq(e.employeeId, 5)).fetchOne();
+
+    Result<IdColumnOnlyEmployee> result = entityql.update(e, employee).execute();
+    assertEquals(employee, result.getEntity());
+    assertEquals(0, result.getCount());
+  }
 }