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.

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

Support Datetime function LOCAL TIME #636

Merged
merged 14 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import java.sql.Date
import java.sql.Time
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
import kotlin.internal.Exact
import kotlin.internal.LowPriorityInOverloadResolution
import kotlin.reflect.KClass
Expand Down Expand Up @@ -754,6 +755,16 @@ open class Jpql : JpqlDsl {
return Expressions.localDate()
}

/**
* Creates an expression that represents the local time.
*
* This is the same as ```LOCAL TIME```.
*/
@SinceJdsl("3.4.0")
fun localTime(): Expression<LocalTime> {
return Expressions.localTime()
}

/**
* Creates an expression that represents the local datetime.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.linecorp.kotlinjdsl.dsl.jpql.expression

import com.linecorp.kotlinjdsl.dsl.jpql.queryPart
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import java.time.LocalTime

class LocalTimeDslTest {

@Test
fun localTime() {
// when
val expression = queryPart {
localTime()
}.toExpression()

val actual: Expression<LocalTime> = expression

// then
val expected = Expressions.localTime()

assertThat(actual).isEqualTo(expected)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLiteral
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLn
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalDate
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalDateTime
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalTime
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocate
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLower
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlMax
Expand Down Expand Up @@ -62,6 +63,7 @@ import java.sql.Date
import java.sql.Time
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
import kotlin.internal.Exact
import kotlin.reflect.KClass

Expand Down Expand Up @@ -334,6 +336,16 @@ object Expressions {
return JpqlLocalDate
}

/**
* Creates an expression that represents the local time.
*
* Matches ```LOCAL TIME```.
*/
@SinceJdsl("3.4.0")
fun localTime(): Expression<LocalTime> {
return JpqlLocalTime
}

/**
* Creates an expression that represents the local datetime.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl

import com.linecorp.kotlinjdsl.Internal
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
import java.time.LocalTime

@Internal
object JpqlLocalTime : Expression<LocalTime>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLiteral
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLn
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalDate
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalDateTime
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalTime
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocate
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLower
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlMax
Expand Down Expand Up @@ -511,6 +512,16 @@ class ExpressionsTest : WithAssertions {
assertThat(actual).isEqualTo(expected)
}

fun localTime() {
// when
val actual = Expressions.localTime()

// then
val expected = JpqlLocalTime

assertThat(actual).isEqualTo(expected)
}

@Test
fun localDateTime() {
// when
Expand All @@ -519,6 +530,7 @@ class ExpressionsTest : WithAssertions {
// then
val expected = JpqlLocalDateTime


assertThat(actual).isEqualTo(expected)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLiteralSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLnSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLocalDateSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLocalDateTimeSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLocalTimeSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLocateSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlLowerSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlMaxSerializer
Expand Down Expand Up @@ -339,6 +340,7 @@ private class DefaultModule : JpqlRenderModule {
JpqlLocalDateSerializer(),
JpqlLocalDateTimeSerializer(),
JpqlLocateSerializer(),
JpqlLocalTimeSerializer(),
JpqlLowerSerializer(),
JpqlMaxSerializer(),
JpqlMinSerializer(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.linecorp.kotlinjdsl.render.jpql.serializer.impl

import com.linecorp.kotlinjdsl.Internal
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalTime
import com.linecorp.kotlinjdsl.render.RenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
import kotlin.reflect.KClass

@Internal
class JpqlLocalTimeSerializer : JpqlSerializer<JpqlLocalTime> {
override fun handledType(): KClass<JpqlLocalTime> {
return JpqlLocalTime::class
}

override fun serialize(part: JpqlLocalTime, writer: JpqlWriter, context: RenderContext) {
writer.write("LOCAL TIME")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.linecorp.kotlinjdsl.render.jpql.serializer.impl

import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalTime
import com.linecorp.kotlinjdsl.render.TestRenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializerTest
import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
import io.mockk.impl.annotations.MockK
import io.mockk.verifySequence
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

@JpqlSerializerTest
class JpqlLocalTimeSerializerTest {
private val sut = JpqlLocalTimeSerializer()

@MockK
private lateinit var writer: JpqlWriter

@MockK
private lateinit var serializer: JpqlRenderSerializer

@Test
fun handle() {
// when
val actual = sut.handledType()

// then
assertThat(actual).isEqualTo(JpqlLocalTime::class)
}

@Test
fun serialize() {
// given
val part = JpqlLocalTime
val context = TestRenderContext(serializer)

// when
sut.serialize(part, writer, context)

// then
verifySequence {
writer.write("LOCAL TIME")
}
}
}
Loading