Refactor the SQL statements splicing, use the array attaching for String params

Author: qiaoyuang

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 - Date format: YYYY-MM-dd
 
+## v1.3.0 / 2024-04-16
+
+### All
+
+* Update `Kotlin`'s version to `1.9.23`
+
+### sqllin-dsl
+
+* Update `kotlinx.coroutines`'s version to `1.8.0`
+* Update `kotlinx.serialization`'s version to `1.6.3`
+* Modified the SQL statements' splicing method, that fixed the [issue#77](https://github.com/ctripcorp/SQLlin/issues/77) that users can't read/write special symbols as the values in SQL statements.
+
+### sqllin-driver
+
+* Update the `sqlite-jdbc`'s version to `3.45.3.0`
+
+### sqllin-processor
+
+* Update `KSP`'s version to `1.9.23-1.0.20`
+
 ## v1.2.4 / 2024-01-05
 
 ### All

gradle.properties

@@ -1,10 +1,10 @@
-VERSION=1.2.4
+VERSION=1.3.0
 GROUP=com.ctrip.kotlin
 
-kotlinVersion=1.9.22
-kspVersion=1.9.22-1.0.16
-serializationVersion=1.6.2
-coroutinesVersion=1.7.3
+kotlinVersion=1.9.23
+kspVersion=1.9.23-1.0.20
+serializationVersion=1.6.3
+coroutinesVersion=1.8.0
 androidxAnnotationVersion=1.7.1
 
 #Maven Publish Information

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Mar 08 15:11:46 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

sqllin-driver/build.gradle.kts

@@ -95,7 +95,7 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
-                implementation("org.xerial:sqlite-jdbc:3.44.1.0")
+                implementation("org.xerial:sqlite-jdbc:3.45.3.0")
             }
         }
     }

sqllin-driver/src/androidMain/kotlin/com/ctrip/sqllin/driver/AndroidDatabaseConnection.kt

@@ -25,17 +25,17 @@ import android.database.sqlite.SQLiteDatabase
 
 internal class AndroidDatabaseConnection(private val database: SQLiteDatabase) : DatabaseConnection {
 
-    override fun execSQL(sql: String, bindParams: Array<Any?>?) =
+    override fun execSQL(sql: String, bindParams: Array<out Any?>?) =
         if (bindParams == null)
             database.execSQL(sql)
         else
             database.execSQL(sql, bindParams)
 
-    override fun executeInsert(sql: String, bindParams: Array<Any?>?) = execSQL(sql, bindParams)
+    override fun executeInsert(sql: String, bindParams: Array<out Any?>?) = execSQL(sql, bindParams)
 
-    override fun executeUpdateDelete(sql: String, bindParams: Array<Any?>?) = execSQL(sql, bindParams)
+    override fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>?) = execSQL(sql, bindParams)
 
-    override fun query(sql: String, bindParams: Array<String?>?): CommonCursor = AndroidCursor(database.rawQuery(sql, bindParams))
+    override fun query(sql: String, bindParams: Array<out String?>?): CommonCursor = AndroidCursor(database.rawQuery(sql, bindParams))
 
     override fun beginTransaction() = database.beginTransaction()
     override fun endTransaction() = database.endTransaction()

sqllin-driver/src/commonMain/kotlin/com/ctrip/sqllin/driver/DatabaseConnection.kt

@@ -23,11 +23,11 @@ package com.ctrip.sqllin.driver
 
 public interface DatabaseConnection {
 
-    public fun execSQL(sql: String, bindParams: Array<Any?>? = null)
-    public fun executeInsert(sql: String, bindParams: Array<Any?>? = null)
-    public fun executeUpdateDelete(sql: String, bindParams: Array<Any?>? = null)
+    public fun execSQL(sql: String, bindParams: Array<out Any?>? = null)
+    public fun executeInsert(sql: String, bindParams: Array<out Any?>? = null)
+    public fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>? = null)
 
-    public fun query(sql: String, bindParams: Array<String?>? = null): CommonCursor
+    public fun query(sql: String, bindParams: Array<out String?>? = null): CommonCursor
 
     public fun beginTransaction()
     public fun setTransactionSuccessful()

sqllin-driver/src/jvmMain/kotlin/com/ctrip/sqllin/driver/AbstractJdbcDatabaseConnection.kt

@@ -29,7 +29,7 @@ internal abstract class AbstractJdbcDatabaseConnection : DatabaseConnection {
 
     abstract fun createStatement(sql: String): PreparedStatement
 
-    protected fun bindParamsToSQL(sql: String, bindParams: Array<Any?>?): PreparedStatement = createStatement(sql).apply {
+    protected fun bindParamsToSQL(sql: String, bindParams: Array<out Any?>?): PreparedStatement = createStatement(sql).apply {
         bindParams?.run {
             require(isNotEmpty()) { "Empty bindArgs" }
             forEachIndexed { index, any ->

sqllin-driver/src/jvmMain/kotlin/com/ctrip/sqllin/driver/ConcurrentDatabaseConnection.kt

@@ -28,19 +28,19 @@ internal class ConcurrentDatabaseConnection(private val delegateConnection: Data
 
     private val accessLock = ReentrantLock()
 
-    override fun execSQL(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun execSQL(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.execSQL(sql, bindParams)
     }
 
-    override fun executeInsert(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun executeInsert(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.executeInsert(sql, bindParams)
     }
 
-    override fun executeUpdateDelete(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.executeUpdateDelete(sql, bindParams)
     }
 
-    override fun query(sql: String, bindParams: Array<String?>?): CommonCursor = accessLock.withLock {
+    override fun query(sql: String, bindParams: Array<out String?>?): CommonCursor = accessLock.withLock {
         delegateConnection.query(sql, bindParams)
     }
 

sqllin-driver/src/jvmMain/kotlin/com/ctrip/sqllin/driver/JdbcDatabaseConnection.kt

@@ -29,25 +29,25 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 internal class JdbcDatabaseConnection(private val connection: Connection) : AbstractJdbcDatabaseConnection() {
 
-    override fun execSQL(sql: String, bindParams: Array<Any?>?) {
+    override fun execSQL(sql: String, bindParams: Array<out Any?>?) {
         bindParamsToSQL(sql, bindParams).use {
             it.execute()
         }
     }
 
-    override fun executeInsert(sql: String, bindParams: Array<Any?>?) {
+    override fun executeInsert(sql: String, bindParams: Array<out Any?>?) {
         executeUpdate(sql, bindParams)
     }
 
-    override fun executeUpdateDelete(sql: String, bindParams: Array<Any?>?) {
+    override fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>?) {
         executeUpdate(sql, bindParams)
     }
 
-    private fun executeUpdate(sql: String, bindParams: Array<Any?>?): Int = bindParamsToSQL(sql, bindParams).use {
+    private fun executeUpdate(sql: String, bindParams: Array<out Any?>?): Int = bindParamsToSQL(sql, bindParams).use {
         it.executeUpdate()
     }
 
-    override fun query(sql: String, bindParams: Array<String?>?): CommonCursor {
+    override fun query(sql: String, bindParams: Array<out String?>?): CommonCursor {
         val statement = connection.prepareStatement(sql)
         bindParams?.forEachIndexed { index, str ->
             str?.let {

sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/ConcurrentDatabaseConnection.kt

@@ -30,19 +30,19 @@ internal class ConcurrentDatabaseConnection(
 
     private val accessLock = Lock()
 
-    override fun execSQL(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun execSQL(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.execSQL(sql, bindParams)
     }
 
-    override fun executeInsert(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun executeInsert(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.executeInsert(sql, bindParams)
     }
 
-    override fun executeUpdateDelete(sql: String, bindParams: Array<Any?>?) = accessLock.withLock {
+    override fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>?) = accessLock.withLock {
         delegateConnection.executeUpdateDelete(sql, bindParams)
     }
 
-    override fun query(sql: String, bindParams: Array<String?>?): CommonCursor = accessLock.withLock {
+    override fun query(sql: String, bindParams: Array<out String?>?): CommonCursor = accessLock.withLock {
         delegateConnection.query(sql, bindParams)
     }