flecomte/postgres-json
1
1
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

remove id in EntityI interface & remove usless EntitiesCollections

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-10-02 11:16:28 +02:00
parent 6641ed78e7
commit 2a738e0595
12 changed files with 83 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/fr/postgresjson/connexion/Query.kt
View File

@@ -12,7 +12,7 @@ class Query(override val name: String, private val sql: String, override val con
/* Select One */
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<R>,
values: List<Any?>,
block: (QueryResult, R?) -> Unit
@@ -20,13 +20,13 @@ class Query(override val name: String, private val sql: String, override val con
return connection.select(this.toString(), typeReference, values, block)
}
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
values: List<Any?> = emptyList(),
noinline block: SelectOneCallback<R> = {}
): R? =
select(object: TypeReference<R>() {}, values, block)
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: (QueryResult, R?) -> Unit
@@ -34,7 +34,7 @@ class Query(override val name: String, private val sql: String, override val con
return connection.select(this.toString(), typeReference, values, block)
}
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
values: Map<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
@@ -42,7 +42,7 @@ class Query(override val name: String, private val sql: String, override val con
/* Select Multiples */
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<List<R>>,
values: List<Any?>,
block: (QueryResult, List<R>) -> Unit
@@ -50,13 +50,13 @@ class Query(override val name: String, private val sql: String, override val con
return connection.select(this.toString(), typeReference, values, block)
}
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
values: List<Any?> = emptyList(),
noinline block: SelectCallback<R> = {}
): List<R> =
select(object: TypeReference<List<R>>() {}, values, block)
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<List<R>>,
values: Map<String, Any?>,
block: (QueryResult, List<R>) -> Unit
@@ -64,13 +64,13 @@ class Query(override val name: String, private val sql: String, override val con
return connection.select(this.toString(), typeReference, values, block)
}
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
values: Map<String, Any?>,
noinline block: SelectCallback<R> = {}
): List<R> =
select(object: TypeReference<List<R>>() {}, values, block)
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
page: Int,
limit: Int,
typeReference: TypeReference<List<R>>,
@@ -82,7 +82,7 @@ class Query(override val name: String, private val sql: String, override val con
/* Select Paginated */
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
page: Int,
limit: Int,
values: Map<String, Any?> = emptyMap(),