Implement power operator

docs/en/jpql-with-kotlin-jdsl/expressions.md

@@ -227,6 +227,8 @@ locate("Book", path(Book::title))
 * FLOOR (floor)
 * INDEX (index)
 * LN (ln)
+* MOD (mod)
+* POWER (power)
 * SIGN (sign)
 * SQRT (sqrt)
 * ROUND (round)
@@ -247,6 +249,8 @@ ln(path(Book::price))
 
 mod(path(Employee::age), 3)
 
+power(path(Book::verticalLength), 2)
+
 sign(path(Book::price))
 
 sqrt(path(Book::price))
@@ -256,10 +260,6 @@ round(path(Book::price), 2)
 size(path(Book::authors))
 ```
 
-| Function | DSL function |
-|----------|--------------|
-| POWER    | not yet      |
-
 ### Datetime functions
 
 * CURRENT\_DATE (currentDate)

docs/ko/jpql-with-kotlin-jdsl/expressions.md

@@ -223,6 +223,8 @@ locate("Book", path(Book::title))
 * FLOOR (floor)
 * INDEX (index)
 * LN (ln)
+* MOD (mod)
+* POWER (power)
 * SIGN (sign)
 * SQRT (sqrt)
 * ROUND (round)
@@ -243,6 +245,8 @@ ln(path(Book::price))
 
 mod(path(Employee::age), 3)
 
+power(path(Book::verticalLength), 2)
+
 sign(path(Book::price))
 
 sqrt(path(Book::price))
@@ -252,10 +256,6 @@ round(path(Book::price), 2)
 size(path(Book::authors))
 ```
 
-| Function | DSL function |
-|----------|--------------|
-| POWER    | not yet      |
-
 ### Datetime functions
 
 * CURRENT\_DATE (currentDate)

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt

@@ -646,6 +646,70 @@ open class Jpql : JpqlDsl {
         return Expressions.ln(value.toExpression())
     }
 
+    /**
+     * Creates an expression that represents the mod of values.
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Any> mod(expr: KProperty1<T, Int>, value: Int): Expression<Int> {
+        return Expressions.mod(Paths.path(expr), Expressions.value(value))
+    }
+
+    /**
+     * Creates an expression that represents the mod of values.
+     */
+    @SinceJdsl("3.4.0")
+    fun mod(value1: Expressionable<Int>, value2: Int): Expression<Int> {
+        return Expressions.mod(value1.toExpression(), Expressions.value(value2))
+    }
+
+    /**
+     * Creates an expression that represents the mod of values.
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Any> mod(expr: KProperty1<T, Int>, value: Expression<Int>): Expression<Int> {
+        return Expressions.mod(Paths.path(expr), value.toExpression())
+    }
+
+    /**
+     * Creates an expression that represents the mod of values.
+     */
+    @SinceJdsl("3.4.0")
+    fun mod(value1: Expressionable<Int>, value2: Expressionable<Int>): Expression<Int> {
+        return Expressions.mod(value1.toExpression(), value2.toExpression())
+    }
+
+    /**
+     * Create expression that calculates the powering of a numeric [base] to a specified [exponent].
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Any, V : Number> power(base: KProperty1<T, @Exact V>, exponent: Int): Expression<V> {
+        return Expressions.power(Paths.path(base), Expressions.value(exponent))
+    }
+
+    /**
+     * Create expression that calculates the powering of a numeric [base] to a specified [exponent].
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Number> power(base: Expressionable<T>, exponent: Int): Expression<T> {
+        return Expressions.power(base.toExpression(), Expressions.value(exponent))
+    }
+
+    /**
+     * Create expression that calculates the powering of a numeric [base] to a specified [exponent].
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Any, V : Number> power(base: KProperty1<T, @Exact V>, exponent: Expression<Int>): Expression<V> {
+        return Expressions.power(Paths.path(base), exponent.toExpression())
+    }
+
+    /**
+     * Create expression that calculates the powering of a numeric [base] to a specified [exponent].
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Number> power(base: Expressionable<T>, exponent: Expressionable<Int>): Expression<T> {
+        return Expressions.power(base.toExpression(), exponent.toExpression())
+    }
+
     /**
      * Creates an expression that represents the sign of value.
      *
@@ -718,38 +782,6 @@ open class Jpql : JpqlDsl {
         return Expressions.round(value.toExpression(), scale.toExpression())
     }
 
-    /**
-     * Creates an expression that represents the mod of values.
-     */
-    @SinceJdsl("3.4.0")
-    fun <T : Any> mod(expr: KProperty1<T, Int>, value: Int): Expression<Int> {
-        return Expressions.mod(Paths.path(expr), Expressions.value(value))
-    }
-
-    /**
-     * Creates an expression that represents the mod of values.
-     */
-    @SinceJdsl("3.4.0")
-    fun mod(value1: Expressionable<Int>, value2: Int): Expression<Int> {
-        return Expressions.mod(value1.toExpression(), Expressions.value(value2))
-    }
-
-    /**
-     * Creates an expression that represents the mod of values.
-     */
-    @SinceJdsl("3.4.0")
-    fun <T : Any> mod(expr: KProperty1<T, Int>, value: Expression<Int>): Expression<Int> {
-        return Expressions.mod(Paths.path(expr), value.toExpression())
-    }
-
-    /**
-     * Creates an expression that represents the mod of values.
-     */
-    @SinceJdsl("3.4.0")
-    fun mod(value1: Expressionable<Int>, value2: Expressionable<Int>): Expression<Int> {
-        return Expressions.mod(value1.toExpression(), value2.toExpression())
-    }
-
     /**
      * Creates an expression that the number of elements of the collection.
      */

dsl/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/PowerDslTest.kt

@@ -0,0 +1,73 @@
+package com.linecorp.kotlinjdsl.dsl.jpql.expression
+
+import com.linecorp.kotlinjdsl.dsl.jpql.entity.employee.Employee
+import com.linecorp.kotlinjdsl.dsl.jpql.queryPart
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions
+import com.linecorp.kotlinjdsl.querymodel.jpql.path.Paths
+import org.assertj.core.api.WithAssertions
+import org.junit.jupiter.api.Test
+
+class PowerDslTest : WithAssertions {
+    private val baseExpression = Paths.path(Employee::age)
+    private val exponentExpression = Expressions.value(2)
+    private val exponentPrimitive = 2
+
+    @Test
+    fun `power() with a property`() {
+        // when
+        val expression1 = queryPart {
+            power(Employee::age, exponentPrimitive)
+        }.toExpression()
+
+        val expression2 = queryPart {
+            power(Employee::age, exponentExpression)
+        }.toExpression()
+
+        val actual1: Expression<Int> = expression1 // for type check
+        val actual2: Expression<Int> = expression2 // for type check
+
+        // then
+        val expected1 = Expressions.power(
+            base = Paths.path(Employee::age),
+            exponent = Expressions.value(exponentPrimitive),
+        )
+
+        val expected2 = Expressions.power(
+            base = Paths.path(Employee::age),
+            exponent = exponentExpression,
+        )
+
+        assertThat(actual1).isEqualTo(expected1)
+        assertThat(actual2).isEqualTo(expected2)
+    }
+
+    @Test
+    fun `power() with a expression`() {
+        // when
+        val expression1 = queryPart {
+            power(baseExpression, exponentPrimitive)
+        }.toExpression()
+
+        val expression2 = queryPart {
+            power(baseExpression, exponentExpression)
+        }.toExpression()
+
+        val actual1: Expression<Int> = expression1 // for type check
+        val actual2: Expression<Int> = expression2 // for type check
+
+        // then
+        val expected1 = Expressions.power(
+            base = baseExpression,
+            exponent = Expressions.value(exponentPrimitive),
+        )
+
+        val expected2 = Expressions.power(
+            base = baseExpression,
+            exponent = exponentExpression,
+        )
+
+        assertThat(actual1).isEqualTo(expected1)
+        assertThat(actual2).isEqualTo(expected2)
+    }
+}

query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt

@@ -40,6 +40,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlNullIf
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlParam
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPathType
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPlus
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPower
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlRound
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlSign
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlSize
@@ -277,6 +278,14 @@ object Expressions {
         return JpqlLn(value)
     }
 
+    /**
+     * Creates expression that calculates the powering of a numeric [base] to a specified [exponent].
+     */
+    @SinceJdsl("3.4.0")
+    fun <T : Number> power(base: Expression<T>, exponent: Expression<Int>): Expression<T> {
+        return JpqlPower(base, exponent)
+    }
+
     /**
      * Creates an expression that represents the sign of a numeric value.
      */

query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/impl/JpqlPower.kt

@@ -0,0 +1,13 @@
+package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl
+
+import com.linecorp.kotlinjdsl.Internal
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
+
+/**
+ * Expression that calculates the powering of a numeric [base] to a specified [exponent].
+ */
+@Internal
+data class JpqlPower<T : Number> internal constructor(
+    val base: Expression<T>,
+    val exponent: Expression<Int>,
+) : Expression<T>

query-model/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/ExpressionsTest.kt

@@ -42,6 +42,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlNullIf
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlParam
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPathType
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPlus
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPower
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlRound
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlSign
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlSize
@@ -428,6 +429,20 @@ class ExpressionsTest : WithAssertions {
         assertThat(actual).isEqualTo(expected)
     }
 
+    @Test
+    fun power() {
+        // when
+        val actual = Expressions.power(doubleExpression1, intExpression1)
+
+        // then
+        val expected = JpqlPower(
+            doubleExpression1,
+            intExpression1,
+        )
+
+        assertThat(actual).isEqualTo(expected)
+    }
+
     @Test
     fun sign() {
         // when

render/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/JpqlRenderContext.kt

@@ -105,6 +105,7 @@ import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPathPropertySeria
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPathTreatSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPathTypeSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPlusSerializer
+import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPowerSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlPredicateParenthesesSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlRoundSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.impl.JpqlSelectQuerySerializer
@@ -370,6 +371,7 @@ private class DefaultModule : JpqlRenderModule {
             JpqlPredicateParenthesesSerializer(),
             JpqlRoundSerializer(),
             JpqlSelectQuerySerializer(),
+            JpqlPowerSerializer(),
             JpqlSignSerializer(),
             JpqlSizeSerializer(),
             JpqlSortSerializer(),

render/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlPowerSerializer.kt

@@ -0,0 +1,31 @@
+package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
+
+import com.linecorp.kotlinjdsl.Internal
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlPower
+import com.linecorp.kotlinjdsl.render.RenderContext
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
+import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
+import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
+import kotlin.reflect.KClass
+
+@Internal
+class JpqlPowerSerializer : JpqlSerializer<JpqlPower<*>> {
+    override fun handledType(): KClass<JpqlPower<*>> {
+        return JpqlPower::class
+    }
+
+    override fun serialize(part: JpqlPower<*>, writer: JpqlWriter, context: RenderContext) {
+        val delegate = context.getValue(JpqlRenderSerializer)
+
+        writer.write("POWER")
+
+        writer.writeParentheses {
+            delegate.serialize(part.base, writer, context)
+
+            writer.write(",")
+            writer.write(" ")
+
+            delegate.serialize(part.exponent, writer, context)
+        }
+    }
+}