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

Rename select to selectOne

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-07-15 03:07:19 +02:00
parent 8a5697cd31
commit eb3a732440
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/fr/postgresjson/connexion/Connection.kt
View File

@@ -49,7 +49,7 @@ class Connection(
fun <A> inTransaction(f: (Connection) -> CompletableFuture<A>) = connect().inTransaction(f)
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
sql: String,
typeReference: TypeReference<R>,
values: List<Any?>,
@@ -71,16 +71,16 @@ class Connection(
values: List<Any?> = emptyList(),
noinline block: SelectOneCallback<R> = {}
): R? =
select(sql, object : TypeReference<R>() {}, values, block)
selectOne(sql, object : TypeReference<R>() {}, values, block)
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
sql: String,
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: (QueryResult, R?) -> Unit
): R? {
return replaceArgs(sql, values) {
select(this.sql, typeReference, this.parameters, block)
selectOne(this.sql, typeReference, parameters, block)
}
}
@@ -89,7 +89,7 @@ class Connection(
values: Map<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
select(sql, object : TypeReference<R>() {}, values, block)
selectOne(sql, object : TypeReference<R>() {}, values, block)
override fun <R : EntityI> select(
sql: String,

4
src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt
View File

@@ -13,13 +13,13 @@ sealed interface EmbedExecutable {
/**
* Select One entity with list of parameters
*/
fun <R : EntityI> select(
fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: List<Any?> = emptyList(),
block: SelectOneCallback<R> = {}
): R?
fun <R : EntityI> select(
fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: SelectOneCallback<R> = {}

6
src/main/kotlin/fr/postgresjson/connexion/Executable.kt
View File

@@ -7,21 +7,21 @@ import fr.postgresjson.entity.EntityI
interface Executable {
/* Select One */
fun <R : EntityI> select(
fun <R : EntityI> selectOne(
sql: String,
typeReference: TypeReference<R>,
values: List<Any?> = emptyList(),
block: SelectOneCallback<R> = {}
): R?
fun <R : EntityI> select(
fun <R : EntityI> selectOne(
sql: String,
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: SelectOneCallback<R> = {}
): R?
/* Select Miltiples */
/* Select Multiples */
fun <R : EntityI> select(
sql: String,

14
src/main/kotlin/fr/postgresjson/connexion/Function.kt
View File

@@ -17,7 +17,7 @@ class Function(val definition: Function, override val connection: Connection) :
/**
* Select One entity with list of parameters
*/
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: List<Any?>,
block: (QueryResult, R?) -> Unit
@@ -25,25 +25,25 @@ class Function(val definition: Function, override val connection: Connection) :
val args = compileArgs(values)
val sql = "SELECT * FROM ${definition.name} ($args)"
return connection.select(sql, typeReference, values, block)
return connection.selectOne(sql, typeReference, values, block)
}
inline fun <reified R : EntityI> selectOne(
values: List<Any?> = emptyList(),
noinline block: SelectOneCallback<R> = {}
): R? =
select(object : TypeReference<R>() {}, values, block)
selectOne(object : TypeReference<R>() {}, values, block)
inline fun <reified R : EntityI> selectOne(
value: R,
noinline block: SelectOneCallback<R> = {}
): R? =
select(object : TypeReference<R>() {}, listOf(value), block)
selectOne(object : TypeReference<R>() {}, listOf(value), block)
/**
* Select One entity with named parameters
*/
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: (QueryResult, R?) -> Unit
@@ -51,14 +51,14 @@ class Function(val definition: Function, override val connection: Connection) :
val args = compileArgs(values)
val sql = "SELECT * FROM ${definition.name} ($args)"
return connection.select(sql, typeReference, values, block)
return connection.selectOne(sql, typeReference, values, block)
}
inline fun <reified R : EntityI> selectOne(
values: Map<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
select(object : TypeReference<R>() {}, values, block)
selectOne(object : TypeReference<R>() {}, values, block)
inline fun <reified R : EntityI> selectOne(
vararg values: Pair<String, Any?>,

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

@@ -11,33 +11,33 @@ class Query(override val name: String, private val sql: String, override val con
/* Select One */
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: List<Any?>,
block: (QueryResult, R?) -> Unit
): R? {
return connection.select(this.toString(), typeReference, values, block)
return connection.selectOne(this.toString(), typeReference, values, block)
}
inline fun <reified R : EntityI> selectOne(
values: List<Any?> = emptyList(),
noinline block: SelectOneCallback<R> = {}
): R? =
select(object : TypeReference<R>() {}, values, block)
selectOne(object : TypeReference<R>() {}, values, block)
override fun <R : EntityI> select(
override fun <R : EntityI> selectOne(
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: (QueryResult, R?) -> Unit
): R? {
return connection.select(this.toString(), typeReference, values, block)
return connection.selectOne(this.toString(), typeReference, values, block)
}
inline fun <reified R : EntityI> selectOne(
values: Map<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
select(object : TypeReference<R>() {}, values, block)
selectOne(object : TypeReference<R>() {}, values, block)
/* Select Multiples */