chore: allow nullable args in reads and writes (#14)

Co-authored-by: DominicGBauer <dominic@nomanini.com>
powersync-ja · Apr 16, 2024 · 44a39dd · 44a39dd
1 parent 67dc62f
commit 44a39dd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/core/src/commonMain/kotlin/com/powersync/db/PowerSyncDatabaseImpl.kt b/core/src/commonMain/kotlin/com/powersync/db/PowerSyncDatabaseImpl.kt
@@ -27,7 +27,6 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 
 /**
  * A PowerSync managed database.
@@ -166,31 +165,31 @@ internal class PowerSyncDatabaseImpl(
 
     override suspend fun <RowType : Any> get(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): RowType {
         return internalDb.get(sql, parameters, mapper)
     }
 
     override suspend fun <RowType : Any> getAll(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): List<RowType> {
         return internalDb.getAll(sql, parameters, mapper)
     }
 
     override suspend fun <RowType : Any> getOptional(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): RowType? {
         return internalDb.getOptional(sql, parameters, mapper)
     }
 
     override fun <RowType : Any> watch(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): Flow<List<RowType>> {
         return internalDb.watch(sql, parameters, mapper)
@@ -205,7 +204,7 @@ internal class PowerSyncDatabaseImpl(
         return internalDb.writeTransaction(body)
     }
 
-    override suspend fun execute(sql: String, parameters: List<Any>?): Long {
+    override suspend fun execute(sql: String, parameters: List<Any?>?): Long {
         return internalDb.execute(sql, parameters)
     }
 

diff --git a/core/src/commonMain/kotlin/com/powersync/db/ReadQueries.kt b/core/src/commonMain/kotlin/com/powersync/db/ReadQueries.kt
@@ -11,7 +11,7 @@ interface ReadQueries {
      */
     suspend fun <RowType : Any> get(
         sql: String,
-        parameters: List<Any>? = listOf(),
+        parameters: List<Any?>? = listOf(),
         mapper: (SqlCursor) -> RowType
     ): RowType
 
@@ -20,7 +20,7 @@ interface ReadQueries {
      */
     suspend fun <RowType : Any> getAll(
         sql: String,
-        parameters: List<Any>? = listOf(),
+        parameters: List<Any?>? = listOf(),
         mapper: (SqlCursor) -> RowType
     ): List<RowType>
 
@@ -29,7 +29,7 @@ interface ReadQueries {
      */
     suspend fun <RowType : Any> getOptional(
         sql: String,
-        parameters: List<Any>? = listOf(),
+        parameters: List<Any?>? = listOf(),
         mapper: (SqlCursor) -> RowType
     ): RowType?
 
@@ -38,7 +38,7 @@ interface ReadQueries {
      */
     fun <RowType : Any> watch(
         sql: String,
-        parameters: List<Any>? = listOf(),
+        parameters: List<Any?>? = listOf(),
         mapper: (SqlCursor) -> RowType
     ): Flow<List<RowType>>
 

diff --git a/core/src/commonMain/kotlin/com/powersync/db/WriteQueries.kt b/core/src/commonMain/kotlin/com/powersync/db/WriteQueries.kt
@@ -7,7 +7,7 @@ interface WriteQueries {
     /**
      * Execute a write query (INSERT, UPDATE, DELETE) and return the number of rows updated for an INSERT/DELETE/UPDATE.
      */
-    suspend fun execute(sql: String, parameters: List<Any>? = listOf()): Long
+    suspend fun execute(sql: String, parameters: List<Any?>? = listOf()): Long
 
     suspend fun <R> writeTransaction(body: suspend SuspendingTransactionWithReturn<R>.() -> R): R
 

diff --git a/core/src/commonMain/kotlin/com/powersync/db/internal/PsInternalDatabase.kt b/core/src/commonMain/kotlin/com/powersync/db/internal/PsInternalDatabase.kt
@@ -55,7 +55,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     override suspend fun execute(
         sql: String,
-        parameters: List<Any>?
+        parameters: List<Any?>?
     ): Long {
         val numParams = parameters?.size ?: 0
 
@@ -68,7 +68,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     override suspend fun <RowType : Any> get(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): RowType {
         return this.createQuery(
@@ -81,7 +81,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     override suspend fun <RowType : Any> getAll(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): List<RowType> {
         return this.createQuery(
@@ -94,7 +94,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     override suspend fun <RowType : Any> getOptional(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): RowType? {
         return this.createQuery(
@@ -107,7 +107,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     override fun <RowType : Any> watch(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
         mapper: (SqlCursor) -> RowType
     ): Flow<List<RowType>> {
 
@@ -204,7 +204,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
 
     private fun getSourceTables(
         sql: String,
-        parameters: List<Any>?,
+        parameters: List<Any?>?,
     ): Set<String> {
         val rows = createQuery(
             query = "EXPLAIN $sql",
@@ -248,7 +248,7 @@ class PsInternalDatabase(val driver: PsSqlDriver, private val scope: CoroutineSc
     )
 }
 
-fun getBindersFromParams(parameters: List<Any>?): (SqlPreparedStatement.() -> Unit)? {
+fun getBindersFromParams(parameters: List<Any?>?): (SqlPreparedStatement.() -> Unit)? {
     if (parameters.isNullOrEmpty()) {
         return null
     }
@@ -260,7 +260,11 @@ fun getBindersFromParams(parameters: List<Any>?): (SqlPreparedStatement.() -> Un
                 is Long -> bindLong(index, parameter)
                 is Double -> bindDouble(index, parameter)
                 is ByteArray -> bindBytes(index, parameter)
-                else -> throw IllegalArgumentException("Unsupported parameter type: ${parameter::class}, at index $index")
+                else -> {
+                    if(parameter != null) {
+                        throw IllegalArgumentException("Unsupported parameter type: ${parameter::class}, at index $index")
+                    }
+                }
             }
         }
     }