diff --git a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt index 14ba324dc5..0ca193de5d 100644 --- a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt +++ b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt @@ -69,7 +69,7 @@ object SqlExpressionBuilder { return EqOp(this, wrap(t)) } - infix fun > Column>.eq(t: T?) : Op { + infix fun > ExpressionWithColumnType>.eq(t: T?) : Op { if (t == null) { return isNull() } @@ -86,7 +86,7 @@ object SqlExpressionBuilder { return NeqOp(this, wrap(other)) } - infix fun > Column>.neq(t: T?) : Op { + infix fun > ExpressionWithColumnType>.neq(t: T?) : Op { if (t == null) { return isNotNull() } @@ -101,18 +101,30 @@ object SqlExpressionBuilder { infix fun, S: T?> ExpressionWithColumnType.less(t: T) : Op = LessOp(this, wrap(t)) + @JvmName("lessEntityID") + infix fun> ExpressionWithColumnType>.less(t: T) : Op = LessOp(this, wrap(t)) + fun, S: T?> ExpressionWithColumnType.less(other: Expression) = LessOp(this, other) infix fun, S: T?> ExpressionWithColumnType.lessEq(t: T) : Op = LessEqOp(this, wrap(t)) + @JvmName("lessEqEntityID") + infix fun> ExpressionWithColumnType>.lessEq(t: T) : Op = LessEqOp(this, wrap(t)) + fun, S: T?> ExpressionWithColumnType.lessEq(other: Expression) : Op = LessEqOp(this, other) infix fun, S: T?> ExpressionWithColumnType.greater(t: T) : Op = GreaterOp(this, wrap(t)) + @JvmName("greaterEntityID") + infix fun> ExpressionWithColumnType>.greater(t: T) : Op = GreaterOp(this, wrap(t)) + fun, S: T?> ExpressionWithColumnType.greater(other: Expression) : Op = GreaterOp(this, other) infix fun, S: T?> ExpressionWithColumnType.greaterEq(t: T) : Op = GreaterEqOp(this, wrap(t)) + @JvmName("greaterEqEntityID") + infix fun> ExpressionWithColumnType>.greaterEq(t: T) : Op = GreaterEqOp(this, wrap(t)) + fun, S: T?> ExpressionWithColumnType.greaterEq(other: Expression) : Op = GreaterEqOp(this, other) operator fun ExpressionWithColumnType.plus(other: Expression) : ExpressionWithColumnType = PlusOp(this, other, columnType)