From bd88e7938da5d54da6fd0fd42fb8cce8bc60724b Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Sun, 18 Jul 2021 03:59:47 +0200
Subject: [PATCH] apply "replaceNamedArgByQuestionMark" on exec() function

---
 .../fr/postgresjson/connexion/Connection.kt   | 52 ++++++++++---------
 .../kotlin/fr/postgresjson/RequesterTest.kt   | 22 ++++++++
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
index 2ea6760..023dabc 100644
--- a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
+++ b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
@@ -172,7 +172,7 @@ class Connection(
     override fun exec(sql: String, values: List<Any?>): QueryResult {
         val compiledValues = compileArgs(values)
         return stopwatchQuery(sql, compiledValues) {
-            connect().sendPreparedStatement(sql, compiledValues).join()
+            connect().sendPreparedStatement(replaceNamedArgByQuestionMark(sql), compiledValues).join()
         }
     }
 
@@ -215,37 +215,41 @@ class Connection(
 
     private fun <T> replaceArgs(sql: String, values: Map<String, Any?>, block: ParametersQuery.() -> T): T {
         val paramRegex = "(?<!:):([a-zA-Z0-9_-]+)".toRegex(RegexOption.IGNORE_CASE)
-        val newArgs = paramRegex.findAll(sql).map { match ->
+        val orderedArgs = paramRegex.findAll(sql).map { match ->
             val name = match.groups[1]!!.value
             values[name] ?: values[name.trimStart('_')] ?: queryError("""Parameter "$name" missing""", sql, values)
         }.toList()
 
-        var newSql = sql
-        values.forEach { (key, _) ->
-            val regex = ":_?$key".toRegex()
-            newSql = newSql.replace(regex, "?")
-        }
+        return block(ParametersQuery(replaceNamedArgByQuestionMark(sql), orderedArgs))
+    }
 
-        return block(ParametersQuery(newSql, newArgs))
+    private fun replaceNamedArgByQuestionMark(sql: String): String =
+        "(?<!:):([a-zA-Z0-9_-]+)"
+            .toRegex(RegexOption.IGNORE_CASE)
+            .replace(sql, "?")
+
+    private fun insertArgsValuesIntoSql(sql: String, values: List<Any?>): String {
+        var i = 0
+
+        /* The regular expression matches a question mark "?" alone, not preceded or followed by another question mark */
+        return """(?<!\?)(\?)(?!\?)"""
+            .toRegex(RegexOption.IGNORE_CASE)
+            .replace(sql) {
+                values[i]
+                    ?.toString()
+                    ?.also { ++i }
+                    ?.let(this::escapeParameter)
+                    ?: queryError("Parameter $i missing", sql, values)
+            }
     }
 
     private fun <T> replaceArgsIntoSql(sql: String, values: List<Any?>, block: (String) -> T): T {
-        /* The regular expression matches a question mark "?" alone, not preceded or followed by another question mark */
-        val paramRegex = """(?<!\?)(\?)(?!\?)""".toRegex(RegexOption.IGNORE_CASE)
-        var i = 0
-        if (values.isNotEmpty()) {
-            /* for each question mark, replace by the value */
-            val newSql = paramRegex.replace(sql) {
-                values[i] ?: queryError("Parameter $i missing", sql, values)
-                val valToReplace = values[i].toString()
-                ++i
-                escapeParameter(valToReplace)
-            }
-
-            return block(newSql)
-        }
-
-        return block(sql)
+        return if (values.isNotEmpty()) {
+            sql
+                .let(this::replaceNamedArgByQuestionMark)
+                .let { insertArgsValuesIntoSql(it, values) }
+                .let(block)
+        } else block(sql)
     }
 
     /**
diff --git a/src/test/kotlin/fr/postgresjson/RequesterTest.kt b/src/test/kotlin/fr/postgresjson/RequesterTest.kt
index ec55c85..ac22209 100644
--- a/src/test/kotlin/fr/postgresjson/RequesterTest.kt
+++ b/src/test/kotlin/fr/postgresjson/RequesterTest.kt
@@ -9,6 +9,7 @@ import fr.postgresjson.connexion.select
 import fr.postgresjson.connexion.selectOne
 import fr.postgresjson.connexion.update
 import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.serializer.deserialize
 import org.junit.Assert
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
@@ -150,6 +151,16 @@ class RequesterTest : TestAbstract() {
         assertEquals(1, result.rowsAffected)
     }
 
+    @Test
+    fun `call exec on query with a list of arguments`() {
+        val resources = this::class.java.getResource("/sql/query")?.toURI()
+        val result = Requester(connection, queriesDirectory = resources)
+            .getQuery("selectOneWithParameters")
+            .exec(listOf("myName"))
+
+        assertEquals("myName", result.rows[0].getString(0)?.deserialize<ObjTest>()?.name)
+    }
+
     @Test
     fun `call exec on function`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
@@ -181,6 +192,17 @@ class RequesterTest : TestAbstract() {
             }
     }
 
+    @Test
+    fun `call sendQuery with same name of arguments as list`() {
+        val resources = this::class.java.getResource("/sql/query")?.toURI()
+        Requester(connection, queriesDirectory = resources)
+            .getQuery("selectMultipleWithSameArgs")
+            .sendQuery(listOf("myName", "myName2")).run {
+                assertEquals("myName", rows[0].getString("firstName"))
+                assertEquals("myName2", rows[0].getString("secondName"))
+            }
+    }
+
     @Test
     fun `call sendQuery with arguments on not same orders`() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()