Skip to content

Commit b9f759a

Browse files
authored
Merge pull request #1141 from momosetkn/feat/unintentionally_nullable_doma_kotlin
Prevent unintentionally nullable values in doma-kotlin.
2 parents e9fd17c + 2570df8 commit b9f759a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class KEntityql(config: Config) {
2323

2424
private val entityql = org.seasar.doma.jdbc.criteria.Entityql(config)
2525

26-
fun <ENTITY> from(
26+
fun <ENTITY : Any> from(
2727
entityMetamodel: EntityMetamodel<ENTITY>,
2828
block: SelectSettings.() -> Unit = {},
2929
): KEntityqlSelectStarting<ENTITY> {
3030
val statement = entityql.from(entityMetamodel, block)
3131
return KEntityqlSelectStarting(statement)
3232
}
3333

34-
fun <ENTITY> from(
34+
fun <ENTITY : Any> from(
3535
entityMetamodel: EntityMetamodel<ENTITY>,
3636
setOperandForSubQuery: KSetOperand<*>,
3737
block: SelectSettings.() -> Unit = {},
@@ -40,7 +40,7 @@ class KEntityql(config: Config) {
4040
return KEntityqlSelectStarting(statement)
4141
}
4242

43-
fun <ENTITY> update(
43+
fun <ENTITY : Any> update(
4444
entityMetamodel: EntityMetamodel<ENTITY>,
4545
entity: ENTITY,
4646
block: UpdateSettings.() -> Unit = {},
@@ -49,7 +49,7 @@ class KEntityql(config: Config) {
4949
return KEntityqlUpdateStatement(statement)
5050
}
5151

52-
fun <ENTITY> delete(
52+
fun <ENTITY : Any> delete(
5353
entityMetamodel: EntityMetamodel<ENTITY>,
5454
entity: ENTITY,
5555
block: DeleteSettings.() -> Unit = {},
@@ -58,7 +58,7 @@ class KEntityql(config: Config) {
5858
return KEntityqlDeleteStatement(statement)
5959
}
6060

61-
fun <ENTITY> insert(
61+
fun <ENTITY : Any> insert(
6262
entityMetamodel: EntityMetamodel<ENTITY>,
6363
entity: ENTITY,
6464
block: InsertSettings.() -> Unit = {},
@@ -67,7 +67,7 @@ class KEntityql(config: Config) {
6767
return KEntityqlInsertStatement(statement)
6868
}
6969

70-
fun <ENTITY> update(
70+
fun <ENTITY : Any> update(
7171
entityMetamodel: EntityMetamodel<ENTITY>,
7272
entities: List<ENTITY>,
7373
block: UpdateSettings.() -> Unit = {},
@@ -76,7 +76,7 @@ class KEntityql(config: Config) {
7676
return KEntityqlBatchUpdateStatement(statement)
7777
}
7878

79-
fun <ENTITY> delete(
79+
fun <ENTITY : Any> delete(
8080
entityMetamodel: EntityMetamodel<ENTITY>,
8181
entities: List<ENTITY>,
8282
block: DeleteSettings.() -> Unit = {},
@@ -85,7 +85,7 @@ class KEntityql(config: Config) {
8585
return KEntityqlBatchDeleteStatement(statement)
8686
}
8787

88-
fun <ENTITY> insert(
88+
fun <ENTITY : Any> insert(
8989
entityMetamodel: EntityMetamodel<ENTITY>,
9090
entities: List<ENTITY>,
9191
block: InsertSettings.() -> Unit = {},

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ class KNativeSql(config: Config?) {
1616

1717
private val nativeSql = org.seasar.doma.jdbc.criteria.NativeSql(config)
1818

19-
fun <ENTITY> from(
19+
fun <ENTITY : Any> from(
2020
entityMetamodel: EntityMetamodel<ENTITY>,
2121
block: SelectSettings.() -> Unit = {},
2222
): KNativeSqlSelectStarting<ENTITY> {
2323
val statement = nativeSql.from(entityMetamodel, block)
2424
return KNativeSqlSelectStarting(statement)
2525
}
2626

27-
fun <ENTITY> from(
27+
fun <ENTITY : Any> from(
2828
entityMetamodel: EntityMetamodel<ENTITY>,
2929
setOperandForSubQuery: KSetOperand<*>,
3030
block: SelectSettings.() -> Unit = {},
@@ -33,23 +33,23 @@ class KNativeSql(config: Config?) {
3333
return KNativeSqlSelectStarting(statement)
3434
}
3535

36-
fun <ENTITY> update(
36+
fun <ENTITY : Any> update(
3737
entityMetamodel: EntityMetamodel<ENTITY>,
3838
block: UpdateSettings.() -> Unit = {},
3939
): KNativeSqlUpdateStarting {
4040
val statement = nativeSql.update(entityMetamodel, block)
4141
return KNativeSqlUpdateStarting(statement)
4242
}
4343

44-
fun <ENTITY> delete(
44+
fun <ENTITY : Any> delete(
4545
entityMetamodel: EntityMetamodel<ENTITY>,
4646
block: DeleteSettings.() -> Unit = {},
4747
): KNativeSqlDeleteStarting {
4848
val statement = nativeSql.delete(entityMetamodel, block)
4949
return KNativeSqlDeleteStarting(statement)
5050
}
5151

52-
fun <ENTITY> insert(
52+
fun <ENTITY : Any> insert(
5353
entityMetamodel: EntityMetamodel<ENTITY>,
5454
block: InsertSettings.() -> Unit = {},
5555
): KNativeSqlInsertStarting {

0 commit comments

Comments
 (0)