Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify entity, join serializers to allow specify entity() as the on clause predicate #731

Merged
merged 4 commits into from
Jun 25, 2024
Merged

modify entity, join serializers to allow specify entity() as the on clause predicate #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
940bbec
fix: add join, on clause
sjnqkqh Jun 21, 2024
77d9ddc
fix: modify entity,join serializers to join,on clause with tests
sjnqkqh Jun 24, 2024
ca20cbf
fix: modify version information of join/on clause 3.0.0 to 3.5.1
sjnqkqh Jun 24, 2024
30b3260
fix: append clause condition to derive entity serializer
sjnqkqh Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .../test/kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/select/SelectExample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions ...r/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/JpqlRenderClause.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
) {
Expand Down
1 change: 1 addition & 0 deletions ...c/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
) {
Expand Down
7 changes: 5 additions & 2 deletions ...inecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand All @@ -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)
}
}
}
7 changes: 5 additions & 2 deletions ...com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand All @@ -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)
}
}
}
7 changes: 5 additions & 2 deletions ...otlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerFetchJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
}
7 changes: 5 additions & 2 deletions ...ain/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
}
7 changes: 5 additions & 2 deletions ...linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationFetchJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand All @@ -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)
}
}
}
7 changes: 5 additions & 2 deletions .../com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftAssociationJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand All @@ -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)
}
}
}
7 changes: 5 additions & 2 deletions ...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftFetchJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
}
8 changes: 5 additions & 3 deletions ...main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLeftJoinSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
}
2 changes: 2 additions & 0 deletions ...in/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlDerivedEntitySerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
Expand Down Expand Up @@ -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),
],
Expand Down
2 changes: 2 additions & 0 deletions ...st/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlEntitySerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
Expand Down Expand Up @@ -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),
],
Expand Down
7 changes: 4 additions & 3 deletions ...orp/kotlinjdsl/render/jpql/serializer/impl/JpqlInnerAssociationFetchJoinSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(" ")
Expand All @@ -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)
}
}
}
Loading
Loading