From eb3a732440a1d4d26459f6882fceb01dfb10751d Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 15 Jul 2021 03:07:19 +0200 Subject: [PATCH] Rename select to selectOne --- .../kotlin/fr/postgresjson/connexion/Connection.kt | 10 +++++----- .../fr/postgresjson/connexion/EmbedExecutable.kt | 4 ++-- .../kotlin/fr/postgresjson/connexion/Executable.kt | 6 +++--- .../kotlin/fr/postgresjson/connexion/Function.kt | 14 +++++++------- src/main/kotlin/fr/postgresjson/connexion/Query.kt | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt index 2cd0712..8355ef3 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt @@ -49,7 +49,7 @@ class Connection( fun inTransaction(f: (Connection) -> CompletableFuture) = connect().inTransaction(f) - override fun select( + override fun selectOne( sql: String, typeReference: TypeReference, values: List, @@ -71,16 +71,16 @@ class Connection( values: List = emptyList(), noinline block: SelectOneCallback = {} ): R? = - select(sql, object : TypeReference() {}, values, block) + selectOne(sql, object : TypeReference() {}, values, block) - override fun select( + override fun selectOne( sql: String, typeReference: TypeReference, values: Map, 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, noinline block: SelectOneCallback = {} ): R? = - select(sql, object : TypeReference() {}, values, block) + selectOne(sql, object : TypeReference() {}, values, block) override fun select( sql: String, diff --git a/src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt b/src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt index 8936b5c..ec9f1a9 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt @@ -13,13 +13,13 @@ sealed interface EmbedExecutable { /** * Select One entity with list of parameters */ - fun select( + fun selectOne( typeReference: TypeReference, values: List = emptyList(), block: SelectOneCallback = {} ): R? - fun select( + fun selectOne( typeReference: TypeReference, values: Map, block: SelectOneCallback = {} diff --git a/src/main/kotlin/fr/postgresjson/connexion/Executable.kt b/src/main/kotlin/fr/postgresjson/connexion/Executable.kt index 5055063..5684ebd 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/Executable.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/Executable.kt @@ -7,21 +7,21 @@ import fr.postgresjson.entity.EntityI interface Executable { /* Select One */ - fun select( + fun selectOne( sql: String, typeReference: TypeReference, values: List = emptyList(), block: SelectOneCallback = {} ): R? - fun select( + fun selectOne( sql: String, typeReference: TypeReference, values: Map, block: SelectOneCallback = {} ): R? - /* Select Miltiples */ + /* Select Multiples */ fun select( sql: String, diff --git a/src/main/kotlin/fr/postgresjson/connexion/Function.kt b/src/main/kotlin/fr/postgresjson/connexion/Function.kt index 824f0cb..bdd73c0 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/Function.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/Function.kt @@ -17,7 +17,7 @@ class Function(val definition: Function, override val connection: Connection) : /** * Select One entity with list of parameters */ - override fun select( + override fun selectOne( typeReference: TypeReference, values: List, 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 selectOne( values: List = emptyList(), noinline block: SelectOneCallback = {} ): R? = - select(object : TypeReference() {}, values, block) + selectOne(object : TypeReference() {}, values, block) inline fun selectOne( value: R, noinline block: SelectOneCallback = {} ): R? = - select(object : TypeReference() {}, listOf(value), block) + selectOne(object : TypeReference() {}, listOf(value), block) /** * Select One entity with named parameters */ - override fun select( + override fun selectOne( typeReference: TypeReference, values: Map, 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 selectOne( values: Map, noinline block: SelectOneCallback = {} ): R? = - select(object : TypeReference() {}, values, block) + selectOne(object : TypeReference() {}, values, block) inline fun selectOne( vararg values: Pair, diff --git a/src/main/kotlin/fr/postgresjson/connexion/Query.kt b/src/main/kotlin/fr/postgresjson/connexion/Query.kt index be9109d..620cdff 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/Query.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/Query.kt @@ -11,33 +11,33 @@ class Query(override val name: String, private val sql: String, override val con /* Select One */ - override fun select( + override fun selectOne( typeReference: TypeReference, values: List, block: (QueryResult, R?) -> Unit ): R? { - return connection.select(this.toString(), typeReference, values, block) + return connection.selectOne(this.toString(), typeReference, values, block) } inline fun selectOne( values: List = emptyList(), noinline block: SelectOneCallback = {} ): R? = - select(object : TypeReference() {}, values, block) + selectOne(object : TypeReference() {}, values, block) - override fun select( + override fun selectOne( typeReference: TypeReference, values: Map, block: (QueryResult, R?) -> Unit ): R? { - return connection.select(this.toString(), typeReference, values, block) + return connection.selectOne(this.toString(), typeReference, values, block) } inline fun selectOne( values: Map, noinline block: SelectOneCallback = {} ): R? = - select(object : TypeReference() {}, values, block) + selectOne(object : TypeReference() {}, values, block) /* Select Multiples */