Skip to content

Commit 1b253a0

Browse files
authored
Merge pull request #1153 from momosetkn/feat/fix_KJoinDeclaration
Fix KJoinDeclaration
2 parents 4c1a68c + 7b2d47f commit 1b253a0

File tree

1 file changed

+9
-9
lines changed
  • doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration

1 file changed

+9
-9
lines changed

doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KJoinDeclaration.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,47 @@ import org.seasar.doma.jdbc.criteria.tuple.Tuple2
1010
import org.seasar.doma.jdbc.criteria.tuple.Tuple3
1111

1212
class KJoinDeclaration(private val declaration: JoinDeclaration) {
13-
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
13+
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
1414
declaration.eq(left, right)
1515
}
1616

1717
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
1818
declaration.eq(left, right)
1919
}
2020

21-
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
21+
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
2222
declaration.ne(left, right)
2323
}
2424

2525
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
2626
declaration.ne(left, right)
2727
}
2828

29-
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
29+
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
3030
declaration.gt(left, right)
3131
}
3232

3333
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
3434
declaration.gt(left, right)
3535
}
3636

37-
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
37+
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
3838
declaration.ge(left, right)
3939
}
4040

4141
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
4242
declaration.ge(left, right)
4343
}
4444

45-
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
45+
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
4646
declaration.lt(left, right)
4747
}
4848

4949
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
5050
declaration.lt(left, right)
5151
}
5252

53-
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
53+
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
5454
declaration.le(left, right)
5555
}
5656

@@ -66,11 +66,11 @@ class KJoinDeclaration(private val declaration: JoinDeclaration) {
6666
declaration.isNotNull(propertyMetamodel)
6767
}
6868

69-
fun <PROPERTY : Any> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
69+
fun <PROPERTY : Any> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
7070
declaration.eqOrIsNull(left, right)
7171
}
7272

73-
fun <PROPERTY : Any> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
73+
fun <PROPERTY : Any> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
7474
declaration.neOrIsNotNull(left, right)
7575
}
7676

@@ -90,7 +90,7 @@ class KJoinDeclaration(private val declaration: JoinDeclaration) {
9090
declaration.notLike(left, right, option)
9191
}
9292

93-
fun <PROPERTY : Any> between(propertyMetamodel: PropertyMetamodel<PROPERTY>, start: PROPERTY, end: PROPERTY) {
93+
fun <PROPERTY : Any> between(propertyMetamodel: PropertyMetamodel<PROPERTY>, start: PROPERTY?, end: PROPERTY?) {
9494
declaration.between(propertyMetamodel, start, end)
9595
}
9696

0 commit comments

Comments
 (0)