Merge branch 'main' into develop

line · Jun 26, 2024 · c8d0f31 · c8d0f31
2 parents 75143df + 025f6c1
commit c8d0f31
Show file tree

Hide file tree

Showing 22 changed files with 113 additions and 37 deletions.
diff --git a/.../test/kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/select/SelectExample.kt b/.../test/kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/select/SelectExample.kt
@@ -4,6 +4,7 @@ import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.author.Author
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.book.Book
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.book.BookAuthor
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.book.BookPrice
+import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.book.BookPublisher
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.book.Isbn
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.employee.Employee
 import com.linecorp.kotlinjdsl.example.spring.data.jpa.jpql.entity.employee.EmployeeDepartment
@@ -51,6 +52,24 @@ class SelectExample : WithAssertions {
         assertThat(actual).isEqualTo(1L)
     }
 
+    @Test
+    fun `books reference specific book publisher entity`() {
+        // when
+        val actual = bookRepository.findAll {
+            select(
+                path(Book::isbn),
+            ).from(
+                entity(Book::class),
+                join(entity(BookPublisher::class)).on(path(BookPublisher::book).eq(entity(Book::class))),
+            ).where(
+                path(BookPublisher::publisherId).eq(3),
+            )
+        }
+
+        // then
+        assertThat(actual).isEqualTo(listOf(Isbn("10"), Isbn("11"), Isbn("12")))
+    }
+
     @Test
     fun `authors who haven't written a book`() {
         // when

diff --git a/...r/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/JpqlRenderClause.kt b/...r/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/JpqlRenderClause.kt
@@ -26,6 +26,12 @@ sealed class JpqlRenderClause : AbstractRenderContextElement(Key) {
     @SinceJdsl("3.0.0")
     open fun isFrom(): Boolean = false
 
+    @SinceJdsl("3.5.1")
+    open fun isJoin(): Boolean = false
+
+    @SinceJdsl("3.5.1")
+    open fun isOn(): Boolean = false
+
     @SinceJdsl("3.0.0")
     open fun isWhere(): Boolean = false
 
@@ -73,6 +79,20 @@ sealed class JpqlRenderClause : AbstractRenderContextElement(Key) {
         override fun toString(): String = "From"
     }
 
+    @SinceJdsl("3.5.1")
+    object Join : JpqlRenderClause() {
+        override fun isJoin(): Boolean = true
+
+        override fun toString(): String = "Join"
+    }
+
+    @SinceJdsl("3.5.1")
+    object On : JpqlRenderClause() {
+        override fun isOn(): Boolean = true
+
+        override fun toString(): String = "On"
+    }
+
     @SinceJdsl("3.0.0")
     object Where : JpqlRenderClause() {
         override fun isWhere(): Boolean = true

diff --git a/...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializer.kt b/...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializer.kt
@@ -24,6 +24,7 @@ class JpqlDerivedEntitySerializer : JpqlSerializer<JpqlDerivedEntity<*>> {
 
         if (
             (statement.isSelect() && clause.isFrom()) ||
+            (statement.isSelect() && clause.isJoin()) ||
             (statement.isUpdate() && clause.isUpdate()) ||
             (statement.isDelete() && clause.isDeleteFrom())
         ) {

diff --git a/...c/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializer.kt b/...c/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializer.kt
@@ -22,6 +22,7 @@ class JpqlEntitySerializer : JpqlSerializer<JpqlEntity<*>> {
 
         if (
             (statement.isSelect() && clause.isFrom()) ||
+            (statement.isSelect() && clause.isJoin()) ||
             (statement.isUpdate() && clause.isUpdate()) ||
             (statement.isDelete() && clause.isDeleteFrom())
         ) {

diff --git a/...inecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializer.kt b/...inecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlInnerAssociationFetchJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,7 +21,8 @@ class JpqlInnerAssociationFetchJoinSerializer : JpqlSerializer<JpqlInnerAssociat
         writer.write("INNER JOIN FETCH")
         writer.write(" ")
 
-        delegate.serialize(part.association, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.association, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("AS")
@@ -35,7 +37,8 @@ class JpqlInnerAssociationFetchJoinSerializer : JpqlSerializer<JpqlInnerAssociat
             writer.write("ON")
             writer.write(" ")
 
-            delegate.serialize(on, writer, context)
+            val newOnContext = context + JpqlRenderClause.On
+            delegate.serialize(on, writer, newOnContext)
         }
     }
 }
diff --git a/...com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationJoinSerializer.kt b/...com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlInnerAssociationJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,7 +21,8 @@ class JpqlInnerAssociationJoinSerializer : JpqlSerializer<JpqlInnerAssociationJo
         writer.write("INNER JOIN")
         writer.write(" ")
 
-        delegate.serialize(part.association, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.association, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("AS")
@@ -35,7 +37,8 @@ class JpqlInnerAssociationJoinSerializer : JpqlSerializer<JpqlInnerAssociationJo
             writer.write("ON")
             writer.write(" ")
 
-            delegate.serialize(on, writer, context)
+            val newOnContext = context + JpqlRenderClause.On
+            delegate.serialize(on, writer, newOnContext)
         }
     }
 }
diff --git a/...otlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerFetchJoinSerializer.kt b/...otlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerFetchJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlInnerFetchJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,12 +21,14 @@ class JpqlInnerFetchJoinSerializer : JpqlSerializer<JpqlInnerFetchJoin<*>> {
         writer.write("INNER JOIN FETCH")
         writer.write(" ")
 
-        delegate.serialize(part.entity, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.entity, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("ON")
         writer.write(" ")
 
-        delegate.serialize(part.on, writer, context)
+        val newOnContext = context + JpqlRenderClause.On
+        delegate.serialize(part.on, writer, newOnContext)
     }
 }
diff --git a/...ain/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerJoinSerializer.kt b/...ain/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlInnerJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,12 +21,14 @@ class JpqlInnerJoinSerializer : JpqlSerializer<JpqlInnerJoin<*>> {
         writer.write("INNER JOIN")
         writer.write(" ")
 
-        delegate.serialize(part.entity, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.entity, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("ON")
         writer.write(" ")
 
-        delegate.serialize(part.on, writer, context)
+        val newOnContext = context + JpqlRenderClause.On
+        delegate.serialize(part.on, writer, newOnContext)
     }
 }
diff --git a/...linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationFetchJoinSerializer.kt b/...linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationFetchJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlLeftAssociationFetchJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,7 +21,8 @@ class JpqlLeftAssociationFetchJoinSerializer : JpqlSerializer<JpqlLeftAssociatio
         writer.write("LEFT JOIN FETCH")
         writer.write(" ")
 
-        delegate.serialize(part.association, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.association, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("AS")
@@ -35,7 +37,8 @@ class JpqlLeftAssociationFetchJoinSerializer : JpqlSerializer<JpqlLeftAssociatio
             writer.write("ON")
             writer.write(" ")
 
-            delegate.serialize(on, writer, context)
+            val newOnContext = context + JpqlRenderClause.On
+            delegate.serialize(on, writer, newOnContext)
         }
     }
 }
diff --git a/.../com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationJoinSerializer.kt b/.../com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlLeftAssociationJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,7 +21,8 @@ class JpqlLeftAssociationJoinSerializer : JpqlSerializer<JpqlLeftAssociationJoin
         writer.write("LEFT JOIN")
         writer.write(" ")
 
-        delegate.serialize(part.association, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.association, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("AS")
@@ -35,7 +37,8 @@ class JpqlLeftAssociationJoinSerializer : JpqlSerializer<JpqlLeftAssociationJoin
             writer.write("ON")
             writer.write(" ")
 
-            delegate.serialize(on, writer, context)
+            val newOnContext = context + JpqlRenderClause.On
+            delegate.serialize(on, writer, newOnContext)
         }
     }
 }
diff --git a/...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftFetchJoinSerializer.kt b/...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftFetchJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlLeftFetchJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -20,12 +21,14 @@ class JpqlLeftFetchJoinSerializer : JpqlSerializer<JpqlLeftFetchJoin<*>> {
         writer.write("LEFT JOIN FETCH")
         writer.write(" ")
 
-        delegate.serialize(part.entity, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.entity, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("ON")
         writer.write(" ")
 
-        delegate.serialize(part.on, writer, context)
+        val newOnContext = context + JpqlRenderClause.On
+        delegate.serialize(part.on, writer, newOnContext)
     }
 }
diff --git a/...main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftJoinSerializer.kt b/...main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftJoinSerializer.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.join.impl.JpqlLeftJoin
 import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -16,16 +17,17 @@ class JpqlLeftJoinSerializer : JpqlSerializer<JpqlLeftJoin<*>> {
 
     override fun serialize(part: JpqlLeftJoin<*>, writer: JpqlWriter, context: RenderContext) {
         val delegate = context.getValue(JpqlRenderSerializer)
-
         writer.write("LEFT JOIN")
         writer.write(" ")
 
-        delegate.serialize(part.entity, writer, context)
+        val newJoinContext = context + JpqlRenderClause.Join
+        delegate.serialize(part.entity, writer, newJoinContext)
 
         writer.write(" ")
         writer.write("ON")
         writer.write(" ")
 
-        delegate.serialize(part.on, writer, context)
+        val newOnContext = context + JpqlRenderClause.On
+        delegate.serialize(part.on, writer, newOnContext)
     }
 }
diff --git a/...in/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializerTest.kt b/...in/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializerTest.kt
@@ -51,6 +51,7 @@ class JpqlDerivedEntitySerializerTest : WithAssertions {
     @StatementClauseSource(
         includes = [
             StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.From::class),
+            StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.Join::class),
             StatementClause(JpqlRenderStatement.Update::class, JpqlRenderClause.Update::class),
             StatementClause(JpqlRenderStatement.Delete::class, JpqlRenderClause.DeleteFrom::class),
         ],
@@ -84,6 +85,7 @@ class JpqlDerivedEntitySerializerTest : WithAssertions {
     @StatementClauseSource(
         excludes = [
             StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.From::class),
+            StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.Join::class),
             StatementClause(JpqlRenderStatement.Update::class, JpqlRenderClause.Update::class),
             StatementClause(JpqlRenderStatement.Delete::class, JpqlRenderClause.DeleteFrom::class),
         ],

diff --git a/...st/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializerTest.kt b/...st/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializerTest.kt
@@ -49,6 +49,7 @@ internal class JpqlEntitySerializerTest : WithAssertions {
     @StatementClauseSource(
         includes = [
             StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.From::class),
+            StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.Join::class),
             StatementClause(JpqlRenderStatement.Update::class, JpqlRenderClause.Update::class),
             StatementClause(JpqlRenderStatement.Delete::class, JpqlRenderClause.DeleteFrom::class),
         ],
@@ -81,6 +82,7 @@ internal class JpqlEntitySerializerTest : WithAssertions {
     @StatementClauseSource(
         excludes = [
             StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.From::class),
+            StatementClause(JpqlRenderStatement.Select::class, JpqlRenderClause.Join::class),
             StatementClause(JpqlRenderStatement.Update::class, JpqlRenderClause.Update::class),
             StatementClause(JpqlRenderStatement.Delete::class, JpqlRenderClause.DeleteFrom::class),
         ],

diff --git a/...orp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializerTest.kt b/...orp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializerTest.kt
@@ -8,6 +8,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.path.Paths
 import com.linecorp.kotlinjdsl.querymodel.jpql.predicate.Predicates
 import com.linecorp.kotlinjdsl.render.TestRenderContext
 import com.linecorp.kotlinjdsl.render.jpql.entity.book.Book
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderClause
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializerTest
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
@@ -60,7 +61,7 @@ class JpqlInnerAssociationFetchJoinSerializerTest : WithAssertions {
         verifySequence {
             writer.write("INNER JOIN FETCH")
             writer.write(" ")
-            serializer.serialize(path1, writer, context)
+            serializer.serialize(path1, writer, context + JpqlRenderClause.Join)
             writer.write(" ")
             writer.write("AS")
             writer.write(" ")
@@ -85,15 +86,15 @@ class JpqlInnerAssociationFetchJoinSerializerTest : WithAssertions {
         verifySequence {
             writer.write("INNER JOIN FETCH")
             writer.write(" ")
-            serializer.serialize(path1, writer, context)
+            serializer.serialize(path1, writer, context + JpqlRenderClause.Join)
             writer.write(" ")
             writer.write("AS")
             writer.write(" ")
             writer.write(entity1.alias)
             writer.write(" ")
             writer.write("ON")
             writer.write(" ")
-            serializer.serialize(predicate1, writer, context)
+            serializer.serialize(predicate1, writer, context + JpqlRenderClause.On)
         }
     }
 }