Substitute joinTos with manual loops.

Author: qiaoyuang

CHANGELOG.md

@@ -15,6 +15,7 @@
 * New experimental API: `DatabaseScope#CREATE`
 * New experimental API: `DatabaseScope#DROP`
 * New experimental API: `DatabaseSceop#ALERT`
+* Support using ByteArray in DSL, that represents BLOB in SQLite
 
 ### sqllin-driver
 

ROADMAP.md

@@ -4,7 +4,8 @@
 
 * Support the key word REFERENCE
 * Support JOIN sub-query
-* Fix the bug of storing ByteArray in DSL
+* Support Enum type
+* Support typealias for primitive types
 
 ## Medium Priority
 

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

@@ -37,9 +37,9 @@ internal class AndroidDatabaseConnection(private val database: SQLiteDatabase) :
 
     override fun executeUpdateDelete(sql: String, bindParams: Array<out Any?>?) = execSQL(sql, bindParams)
 
-    override fun query(sql: String, bindParams: Array<out Any?>?): CommonCursor =
-        if (bindParams == null) {
-            AndroidCursor(database.rawQuery(sql, null))
+    override fun query(sql: String, bindParams: Array<out Any?>?): CommonCursor {
+        val cursor = if (bindParams == null) {
+            database.rawQuery(sql, null)
         } else {
             // Use rawQueryWithFactory to bind parameters with proper types
             // This allows us to bind parameters with their actual types (Int, Long, Double, etc.)
@@ -50,8 +50,10 @@ internal class AndroidDatabaseConnection(private val database: SQLiteDatabase) :
             }
             // Pass emptyArray() for selectionArgs since we bind parameters via the factory
             // Use empty string for editTable since it's only needed for updateable cursors
-            AndroidCursor(database.rawQueryWithFactory(cursorFactory, sql, null, ""))
+            database.rawQueryWithFactory(cursorFactory, sql, null, "")
         }
+        return AndroidCursor(cursor)
+    }
 
     /**
      * Binds parameters to SQLiteQuery with proper type handling.

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/compiler/InsertValuesEncoder.kt

@@ -37,6 +37,7 @@ import kotlinx.serialization.modules.SerializersModule
  *
  * @param parameters Mutable list to accumulate parameter values
  * @param primaryKeyName Name of primary key field to skip, or null to include all fields
+ * @param isInsertId whether ignore encoding the special primary key that represents rowid in SQLite
  *
  * @author Yuang Qiao
  */

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/operation/Create.kt

@@ -114,12 +114,17 @@ internal object Create : Operation {
                     append(',')
             }
         }
-        table.primaryKeyInfo?.compositePrimaryKeys?.joinTo(
-            buffer = this,
-            separator = ",",
-            prefix = ", PRIMARY KEY (",
-            postfix = ")",
-        )
+        table.primaryKeyInfo?.compositePrimaryKeys?.let {
+            append(", PRIMARY KEY (")
+            if (it.isEmpty())
+                return@let
+            append(it[0])
+            for (i in 1 ..< it.size) {
+                append(',')
+                append(it[i])
+            }
+            append(')')
+        }
         append(')')
     }
 }

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/statement/JoinStatementWithoutCondition.kt

@@ -57,13 +57,13 @@ public class JoinStatementWithoutCondition<R> internal constructor(
         require(iterator.hasNext()) { "Param 'clauseElements' must not be empty!!!" }
         val sql = buildString {
             append(sqlStr)
-            clauseElements.joinTo(
-                buffer = this,
-                separator = ",",
-                prefix = " USING (",
-                postfix = ")",
-                transform = { it.valueName }
-            )
+            append(" USING (")
+            append(iterator.next().valueName)
+            while (iterator.hasNext()) {
+                append(',')
+                append(iterator.next().valueName)
+            }
+            append(')')
         }
         val joinStatement = JoinSelectStatement(sql, deserializer, connection, container, null)
         addSelectStatement(joinStatement)