feature #6: Implement named parameters

src/main/kotlin/fr/postgresjson/connexion/Connection.kt

@@ -13,8 +13,11 @@ import java.util.concurrent.CompletableFuture
 
 interface Executable {
     fun <T, R : EntityI<T?>?> select(sql: String, typeReference: TypeReference<R>, values: List<Any?> = emptyList()): R?
+    fun <T, R : EntityI<T?>?> select(sql: String, typeReference: TypeReference<R>, values: Map<String, Any?>): R?
     fun <T, R : List<EntityI<T?>?>> select(sql: String, typeReference: TypeReference<R>, values: List<Any?> = emptyList()): R?
+    fun <T, R : List<EntityI<T?>?>> select(sql: String, typeReference: TypeReference<R>, values: Map<String, Any?>): R
     fun exec(sql: String, values: List<Any?> = emptyList()): CompletableFuture<QueryResult>
+    fun exec(sql: String, values: Map<String, Any?>): CompletableFuture<QueryResult>
 }
 
 class Connection(
@@ -47,9 +50,21 @@ class Connection(
             serializer.deserialize(json, typeReference)
         }
     }
-
     inline fun <T, reified R : EntityI<T?>?> selectOne(sql: String, values: List<Any?> = emptyList()): R? = select(sql, object: TypeReference<R>() {}, values)
 
+    override fun <T, R : EntityI<T?>?> select(sql: String, typeReference: TypeReference<R>, values: Map<String, Any?>): R? {
+        val args = compileArgs(values)
+        val replacedQuery = replaceArgs(sql, args)
+        val future = connect().sendPreparedStatement(replacedQuery.sql, replacedQuery.parameters)
+        val json = future.get().rows[0].getString(0)
+        return if (json === null) {
+            null
+        } else {
+            serializer.deserialize(json, typeReference)
+        }
+    }
+    inline fun <T, reified R : EntityI<T?>?> selectOne(sql: String, values: Map<String, Any?>): R? = select(sql, object: TypeReference<R>() {}, values)
+
     override fun <T, R : List<EntityI<T?>?>> select(sql: String, typeReference: TypeReference<R>, values: List<Any?>): R {
         val future = connect().sendPreparedStatement(sql, compileArgs(values))
         val json = future.get().rows[0].getString(0)
@@ -59,13 +74,30 @@ class Connection(
             serializer.deserializeList(json, typeReference)
         }
     }
-
     inline fun <T, reified R : List<EntityI<T?>?>> select(sql: String, values: List<Any?> = emptyList()): R = select(sql, object : TypeReference<R>() {}, values)
 
+    override fun <T, R : List<EntityI<T?>?>> select(sql: String, typeReference: TypeReference<R>, values: Map<String, Any?>): R {
+        val args = compileArgs(values)
+        val replacedQuery = replaceArgs(sql, args)
+        val future = connect().sendPreparedStatement(replacedQuery.sql, replacedQuery.parameters)
+        val json = future.get().rows[0].getString(0)
+        return if (json === null) {
+            listOf<EntityI<T?>?>() as R
+        } else {
+            serializer.deserializeList(json, typeReference)
+        }
+    }
+    inline fun <T, reified R : List<EntityI<T?>?>> select(sql: String, values: Map<String, Any?>): R = select(sql, object : TypeReference<R>() {}, values)
+
     override fun exec(sql: String, values: List<Any?>): CompletableFuture<QueryResult> {
         return connect().sendPreparedStatement(sql, compileArgs(values))
     }
 
+    override fun exec(sql: String, values: Map<String, Any?>): CompletableFuture<QueryResult> {
+        val replacedQuery = replaceArgs(sql, values)
+        return exec(replacedQuery.sql, replacedQuery.parameters)
+    }
+
     private fun compileArgs(values: List<Any?>): List<Any?> {
         return values.map {
             if (it is EntityI<*>) {
@@ -77,5 +109,36 @@ class Connection(
             }
         }
     }
+
+    private fun compileArgs(values: Map<String, Any?>): Map<String, Any?> {
+        return values.map {(key, value) ->
+            if (value is EntityI<*>) {
+                val json = serializer.serialize(value)
+                serializer.collection.set<Any?, EntityI<Any?>>(value as EntityI<Any?>)
+                key to json
+            } else {
+                key to value
+            }
+        }.toMap()
+    }
+
+    private fun replaceArgs(sql: String, values: Map<String, Any?>): ParametersQuery {
+        val paramRegex = "(?<!:):([a-zA-Z0-9_-]+)".toRegex(RegexOption.IGNORE_CASE)
+        val newArgs = paramRegex.findAll(sql).map { match ->
+            val name = match.groups[1]!!.value
+            values[name] ?: error("Parameter $name missing")
+        }.toList()
+
+        var newSql = sql
+        values.forEach { (key, _) ->
+            val regex = ":$key".toRegex()
+            newSql = newSql.replace(regex, "?")
+        }
+
+
+        return ParametersQuery(newSql, newArgs)
+    }
+
+    data class ParametersQuery(val sql: String, val parameters: List<Any?>)
 }