@@ -75,7 +75,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
75
75
entityType : KClass <E >,
76
76
limit : Int? = null,
77
77
con : Connection ? = null,
78
- block : KMutableRootQuery < KNonNullTable < E > >.() -> KConfigurableRootQuery <KNonNullTable <E >, R >
78
+ block : KMutableRootQuery . ForEntity < E >.() -> KConfigurableRootQuery <KNonNullTable <E >, R >
79
79
): List <R > = queries
80
80
.forEntity(entityType, block)
81
81
.let { q ->
@@ -184,7 +184,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
184
184
fetcher : Fetcher <E >,
185
185
limit : Int? = null,
186
186
con : Connection ? = null,
187
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit = {}
187
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit = {}
188
188
): List <E > = executeQuery(fetcher.javaClass.kotlin, limit, con) {
189
189
block()
190
190
select(table.fetch(fetcher))
@@ -193,7 +193,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
193
193
fun <E : Any > findOne (
194
194
fetcher : Fetcher <E >,
195
195
con : Connection ? = null,
196
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit
196
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit
197
197
): E = findAll(fetcher, 2 , null , block).let {
198
198
when (it.size) {
199
199
0 -> throw EmptyResultException ()
@@ -205,7 +205,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
205
205
fun <E : Any > findOneOrNull (
206
206
fetcher : Fetcher <E >,
207
207
con : Connection ? = null,
208
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit
208
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit
209
209
): E ? = findAll(fetcher, 2 , con, block).let {
210
210
when (it.size) {
211
211
0 -> null
@@ -218,7 +218,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
218
218
viewType : KClass <V >,
219
219
limit : Int? = null,
220
220
con : Connection ? = null,
221
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit = {}
221
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit = {}
222
222
): List <V > {
223
223
val metadata = DtoMetadata .of(viewType.java)
224
224
return findAll(metadata.fetcher, limit, con, block).map(metadata.converter::apply)
@@ -227,7 +227,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
227
227
fun <E : Any , V : View <E >> findOne (
228
228
viewType : KClass <V >,
229
229
con : Connection ? = null,
230
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit
230
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit
231
231
): V {
232
232
val metadata = DtoMetadata .of(viewType.java)
233
233
return findOne(metadata.fetcher, con, block).let (metadata.converter::apply)
@@ -236,7 +236,7 @@ interface KSqlClient : KDeprecatedMoreSaveOperations {
236
236
fun <E : Any , V : View <E >> findOneOrNull (
237
237
viewType : KClass <V >,
238
238
con : Connection ? = null,
239
- block : KMutableRootQuery < KNonNullTable < E > >.() -> Unit
239
+ block : KMutableRootQuery . ForEntity < E >.() -> Unit
240
240
): V ? {
241
241
val metadata = DtoMetadata .of(viewType.java)
242
242
return findOneOrNull(metadata.fetcher, con, block)?.let (metadata.converter::apply)
0 commit comments