Support subQuery in for KEntityql and KNativeSql (#1068)

Author: momosetkn

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

@@ -15,6 +15,7 @@ import org.seasar.doma.kotlin.jdbc.criteria.statement.KEntityqlDeleteStatement
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KEntityqlInsertStatement
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KEntityqlSelectStarting
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KEntityqlUpdateStatement
+import org.seasar.doma.kotlin.jdbc.criteria.statement.KSetOperand
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KStatement
 
 class KEntityql(config: Config) {
@@ -29,6 +30,15 @@ class KEntityql(config: Config) {
         return KEntityqlSelectStarting(statement)
     }
 
+    fun <ENTITY> from(
+        entityMetamodel: EntityMetamodel<ENTITY>,
+        setOperandForSubQuery: KSetOperand<*>,
+        block: SelectSettings.() -> Unit = {},
+    ): KEntityqlSelectStarting<ENTITY> {
+        val statement = entityql.from(entityMetamodel, setOperandForSubQuery.asSetOperand(), block)
+        return KEntityqlSelectStarting(statement)
+    }
+
     fun <ENTITY> update(
         entityMetamodel: EntityMetamodel<ENTITY>,
         entity: ENTITY,

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

@@ -10,6 +10,7 @@ import org.seasar.doma.kotlin.jdbc.criteria.statement.KNativeSqlDeleteStarting
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KNativeSqlInsertStarting
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KNativeSqlSelectStarting
 import org.seasar.doma.kotlin.jdbc.criteria.statement.KNativeSqlUpdateStarting
+import org.seasar.doma.kotlin.jdbc.criteria.statement.KSetOperand
 
 class KNativeSql(config: Config?) {
 
@@ -23,6 +24,15 @@ class KNativeSql(config: Config?) {
         return KNativeSqlSelectStarting(statement)
     }
 
+    fun <ENTITY> from(
+        entityMetamodel: EntityMetamodel<ENTITY>,
+        setOperandForSubQuery: KSetOperand<*>,
+        block: SelectSettings.() -> Unit = {},
+    ): KNativeSqlSelectStarting<ENTITY> {
+        val statement = nativeSql.from(entityMetamodel, setOperandForSubQuery.asSetOperand(), block)
+        return KNativeSqlSelectStarting(statement)
+    }
+
     fun <ENTITY> update(
         entityMetamodel: EntityMetamodel<ENTITY>,
         block: UpdateSettings.() -> Unit = {},

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

@@ -15,6 +15,7 @@ import org.seasar.doma.message.Message
 internal class KEntityqlSelectTest {
 
     private val entityql = org.seasar.doma.kotlin.jdbc.criteria.KEntityql(MockConfig())
+    private val nativeSql = org.seasar.doma.kotlin.jdbc.criteria.KNativeSql(MockConfig())
 
     @Test
     fun from() {
@@ -27,6 +28,18 @@ internal class KEntityqlSelectTest {
         )
     }
 
+    @Test
+    fun from_with_subQuery() {
+        val e = Emp_()
+        val subQueryStmt = nativeSql.from(e)
+        val stmt = entityql.from(e, subQueryStmt)
+        val sql = stmt.asSql()
+        assertEquals(
+            "select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from (select t0_.ID AS ID, t0_.NAME AS NAME, t0_.SALARY AS SALARY, t0_.VERSION AS VERSION from EMP t0_) t0_",
+            sql.formattedSql,
+        )
+    }
+
     @Test
     fun innerJoin() {
         val e = Emp_()

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

@@ -54,6 +54,18 @@ internal class KNativeSqlSelectTest {
         )
     }
 
+    @Test
+    fun from_with_subQuery() {
+        val e = Emp_()
+        val subQueryStmt = nativeSql.from(e)
+        val stmt = nativeSql.from(e, subQueryStmt)
+        val sql = stmt.asSql()
+        assertEquals(
+            "select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from (select t0_.ID AS ID, t0_.NAME AS NAME, t0_.SALARY AS SALARY, t0_.VERSION AS VERSION from EMP t0_) t0_",
+            sql.formattedSql,
+        )
+    }
+
     @Test
     fun where_eq() {
         val e = Emp_()