Merge pull request #447 from domaframework/exclude-null

Support the excludeNull setting for the INSERT and the UPDATE queries…

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/InsertSettings.java

@@ -2,6 +2,7 @@
 
 public class InsertSettings extends Settings {
   private int batchSize = 0;
+  private boolean excludeNull;
 
   public int getBatchSize() {
     return batchSize;
@@ -10,4 +11,12 @@ public int getBatchSize() {
   public void setBatchSize(int batchSize) {
     this.batchSize = batchSize;
   }
+
+  public boolean getExcludeNull() {
+    return excludeNull;
+  }
+
+  public void setExcludeNull(boolean excludeNull) {
+    this.excludeNull = excludeNull;
+  }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/UpdateSettings.java

@@ -5,6 +5,7 @@ public class UpdateSettings extends Settings {
   private boolean allowEmptyWhere;
   private boolean ignoreVersion;
   private boolean suppressOptimisticLockException;
+  private boolean excludeNull;
 
   public int getBatchSize() {
     return batchSize;
@@ -37,4 +38,12 @@ public boolean getSuppressOptimisticLockException() {
   public void setSuppressOptimisticLockException(boolean suppressOptimisticLockException) {
     this.suppressOptimisticLockException = suppressOptimisticLockException;
   }
+
+  public boolean getExcludeNull() {
+    return excludeNull;
+  }
+
+  public void setExcludeNull(boolean excludeNull) {
+    this.excludeNull = excludeNull;
+  }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertStatement.java

@@ -41,7 +41,7 @@ protected Command<Result<ENTITY>> createCommand() {
     query.setCallerMethodName(EXECUTE_METHOD_NAME);
     query.setQueryTimeout(settings.getQueryTimeout());
     query.setSqlLogType(settings.getSqlLogType());
-    query.setNullExcluded(false);
+    query.setNullExcluded(settings.getExcludeNull());
     query.setIncludedPropertyNames();
     query.setExcludedPropertyNames();
     query.setMessage(settings.getComment());

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java

@@ -41,7 +41,7 @@ protected Command<Result<ENTITY>> createCommand() {
     query.setCallerMethodName(EXECUTE_METHOD_NAME);
     query.setQueryTimeout(settings.getQueryTimeout());
     query.setSqlLogType(settings.getSqlLogType());
-    query.setNullExcluded(false);
+    query.setNullExcluded(settings.getExcludeNull());
     query.setVersionIgnored(settings.getIgnoreVersion());
     query.setIncludedPropertyNames();
     query.setExcludedPropertyNames();

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/EntityqlInsertTest.java

@@ -30,4 +30,20 @@ void insertInto() {
         "insert into EMP (ID, NAME, SALARY, VERSION) values (1, 'aaa', 1000, 1)",
         sql.getFormattedSql());
   }
+
+  @Test
+  void excludeNull() {
+    Emp emp = new Emp();
+    emp.setId(1);
+    emp.setName(null);
+    emp.setSalary(new BigDecimal("1000"));
+    emp.setVersion(1);
+
+    Emp_ e = new Emp_();
+    Buildable<?> stmt = entityql.insert(e, emp, settings -> settings.setExcludeNull(true));
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "insert into EMP (ID, SALARY, VERSION) values (1, 1000, 1)", sql.getFormattedSql());
+  }
 }

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/EntityqlUpdateTest.java

@@ -47,4 +47,21 @@ void ignoreVersion() {
         "update EMP set NAME = 'aaa', SALARY = 1000, VERSION = 1 where ID = 1",
         sql.getFormattedSql());
   }
+
+  @Test
+  void excludeNull() {
+    Emp emp = new Emp();
+    emp.setId(1);
+    emp.setName(null);
+    emp.setSalary(new BigDecimal("1000"));
+    emp.setVersion(1);
+
+    Emp_ e = new Emp_();
+    Buildable<?> stmt = entityql.update(e, emp, settings -> settings.setExcludeNull(true));
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "update EMP set SALARY = 1000, VERSION = 1 + 1 where ID = 1 and VERSION = 1",
+        sql.getFormattedSql());
+  }
 }