diff --git a/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt b/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt index 67a437fc6..653856899 100644 --- a/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt +++ b/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt @@ -646,38 +646,6 @@ open class Jpql : JpqlDsl { return Expressions.ln(value.toExpression()) } - /** - * Create expression that calculates the powering of a numeric [base] to a specified [exponent]. - */ - @SinceJdsl("3.4.0") - fun power(base: KProperty1, exponent: Number): Expression { - 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 power(base: KProperty1, exponent: Expressionable): Expression { - 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 power(base: Expressionable, exponent: T): Expression { - 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 power(base: Expressionable, exponent: Expressionable): Expression { - return Expressions.power(base.toExpression(), exponent.toExpression()) - } - /** * Creates an expression that represents the sign of value. * @@ -782,6 +750,38 @@ open class Jpql : JpqlDsl { return Expressions.mod(value1.toExpression(), value2.toExpression()) } + /** + * Create an expression that represents the power of [base] and [exponent]. + */ + @SinceJdsl("3.4.0") + fun power(base: KProperty1, exponent: Number): Expression { + return Expressions.power(Paths.path(base), Expressions.value(exponent)) + } + + /** + * Create an expression that represents the power of [base] and [exponent]. + */ + @SinceJdsl("3.4.0") + fun power(base: Expressionable, exponent: T): Expression { + return Expressions.power(base.toExpression(), Expressions.value(exponent)) + } + + /** + * Create an expression that represents the power of [base] and [exponent]. + */ + @SinceJdsl("3.4.0") + fun power(base: KProperty1, exponent: Expressionable): Expression { + return Expressions.power(Paths.path(base), exponent.toExpression()) + } + + /** + * Create an expression that represents the power of [base] and [exponent]. + */ + @SinceJdsl("3.4.0") + fun power(base: Expressionable, exponent: Expressionable): Expression { + return Expressions.power(base.toExpression(), exponent.toExpression()) + } + /** * Creates an expression that the number of elements of the collection. */ diff --git a/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt b/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt index d851af550..b06486cf3 100644 --- a/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt +++ b/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt @@ -279,7 +279,7 @@ object Expressions { } /** - * Creates expression that calculates the powering of a numeric [base] to a specified [exponent]. + * Create an expression that represents the power of [base] and [exponent]. */ @SinceJdsl("3.4.0") fun power(base: Expression, exponent: Expression): Expression {