Support isNull and isNotNull predicates in ON clause of Criteria API (#729)

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/JoinDeclaration.java

@@ -53,4 +53,28 @@ public <PROPERTY> void lt(PropertyMetamodel<PROPERTY> left, PropertyMetamodel<PR
     Objects.requireNonNull(right);
     add(new Criterion.Lt(new Operand.Prop(left), new Operand.Prop(right)));
   }
+
+  /**
+   * Adds a {@code IS NULL} operator.
+   *
+   * @param propertyMetamodel the operand
+   * @param <PROPERTY> the property type
+   * @throws NullPointerException if {@code propertyMetamodel} is null
+   */
+  public <PROPERTY> void isNull(PropertyMetamodel<PROPERTY> propertyMetamodel) {
+    Objects.requireNonNull(propertyMetamodel);
+    add(new Criterion.IsNull(new Operand.Prop(propertyMetamodel)));
+  }
+
+  /**
+   * Adds a {@code IS NOT NULL} operator.
+   *
+   * @param propertyMetamodel the operand
+   * @param <PROPERTY> the property type
+   * @throws NullPointerException if {@code propertyMetamodel} is null
+   */
+  public <PROPERTY> void isNotNull(PropertyMetamodel<PROPERTY> propertyMetamodel) {
+    Objects.requireNonNull(propertyMetamodel);
+    add(new Criterion.IsNotNull(new Operand.Prop(propertyMetamodel)));
+  }
 }

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

@@ -704,12 +704,14 @@ void join_on() {
                   on.gt(e.id, d.id);
                   on.le(e.id, d.id);
                   on.lt(e.id, d.id);
+                  on.isNull(e.name);
+                  on.isNotNull(e.name);
                 })
             .select(e.id);
 
     Sql<?> sql = stmt.asSql();
     assertEquals(
-        "select t0_.ID from EMP t0_ inner join CATA.DEPT t1_ on (t0_.ID = t1_.ID and t0_.ID <> t1_.ID and t0_.ID >= t1_.ID and t0_.ID > t1_.ID and t0_.ID <= t1_.ID and t0_.ID < t1_.ID)",
+        "select t0_.ID from EMP t0_ inner join CATA.DEPT t1_ on (t0_.ID = t1_.ID and t0_.ID <> t1_.ID and t0_.ID >= t1_.ID and t0_.ID > t1_.ID and t0_.ID <= t1_.ID and t0_.ID < t1_.ID and t0_.NAME is null and t0_.NAME is not null)",
         sql.getFormattedSql());
   }
 

doma-kotlin/src/main/kotlin/org/seasar/doma/jdbc/criteria/declaration/KJoinDeclaration.kt

@@ -27,4 +27,12 @@ class KJoinDeclaration(private val declaration: JoinDeclaration) {
     fun <PROPERTY> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
         declaration.lt(left, right)
     }
+
+    fun <PROPERTY> isNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
+        declaration.isNull(propertyMetamodel)
+    }
+
+    fun <PROPERTY> isNotNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
+        declaration.isNotNull(propertyMetamodel)
+    }
 }

doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KNativeSqlSelectTest.kt

@@ -646,11 +646,13 @@ internal class KNativeSqlSelectTest {
                 gt(e.id, d.id)
                 le(e.id, d.id)
                 lt(e.id, d.id)
+                isNull(e.name)
+                isNotNull(e.name)
             }
             .select(e.id)
         val sql = stmt.asSql()
         assertEquals(
-            "select t0_.ID from EMP t0_ inner join CATA.DEPT t1_ on (t0_.ID = t1_.ID and t0_.ID <> t1_.ID and t0_.ID >= t1_.ID and t0_.ID > t1_.ID and t0_.ID <= t1_.ID and t0_.ID < t1_.ID)",
+            "select t0_.ID from EMP t0_ inner join CATA.DEPT t1_ on (t0_.ID = t1_.ID and t0_.ID <> t1_.ID and t0_.ID >= t1_.ID and t0_.ID > t1_.ID and t0_.ID <= t1_.ID and t0_.ID < t1_.ID and t0_.NAME is null and t0_.NAME is not null)",
             sql.formattedSql
         )
     }