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

Fix function replaceArgsIntoSql

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-08-04 22:24:24 +02:00
parent 13f0f12c1b
commit f56c84c675
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ class Connection(
.plus("limit" to limit) .plus("limit" to limit)
val line = replaceArgs(sql, newValues) { val line = replaceArgs(sql, newValues) {
exec(this.sql, compileArgs(this.parameters)) exec(this.sql, this.parameters)
} }
return line.run { return line.run {
@@ -228,16 +228,20 @@ class Connection(
} }
private fun <T> replaceArgsIntoSql(sql: String, values: List<Any?>, block: (String) -> T): T { private fun <T> replaceArgsIntoSql(sql: String, values: List<Any?>, block: (String) -> T): T {
val paramRegex = "(?<!\\?)(\\?)".toRegex(RegexOption.IGNORE_CASE) val paramRegex = "(?<!\\?)(\\?)(?!\\?)".toRegex(RegexOption.IGNORE_CASE)
var i = 0 var i = 0
val newSql = paramRegex.replace(sql) { _ -> if (values.isNotEmpty()) {
values[i] ?: error("Parameter $i missing") val newSql = paramRegex.replace(sql) {
val valToReplace = values[i].toString() values[i] ?: error("Parameter $i missing")
++i val valToReplace = values[i].toString()
"'$valToReplace'" ++i
"'$valToReplace'"
}
return block(newSql)
} }
return block(newSql) return block(sql)
} }
data class ParametersQuery(val sql: String, val parameters: List<Any?>) data class ParametersQuery(val sql: String, val parameters: List<Any?>)