Merge pull request #108 from touchlab/robxyy-robx.20230729.emptybytes

Robxyy robx.20230729.emptybytes

Author: kpgalligan

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/interop/ActualSqliteStatement.kt

@@ -10,6 +10,7 @@ private const val EMPTY_STRING = ""
 
 internal class ActualSqliteStatement(private val db: SqliteDatabase, private val stmtPointer: SqliteStatementPointer) :
     SqliteStatement {
+    private val emptyBytes = ByteArray(0)
 
     //Cursor methods
     override fun isNull(index: Int): Boolean =
@@ -29,8 +30,12 @@ internal class ActualSqliteStatement(private val db: SqliteDatabase, private val
         val blobSize = sqlite3_column_bytes(stmtPointer, columnIndex)
         val blob = sqlite3_column_blob(stmtPointer, columnIndex)
 
-        if (blobSize < 0 || blob == null)
+        if (blobSize < 0 || blob == null) {
+            if (blobSize == 0 && !isNull(columnIndex)) {
+                return emptyBytes
+            }
             throw sqlException(db.logger, db.config, "Byte array size/type issue col $columnIndex")
+        }
 
         return blob.readBytes(blobSize)
     }
@@ -125,7 +130,11 @@ internal class ActualSqliteStatement(private val db: SqliteDatabase, private val
     }
 
     override fun bindBlob(index: Int, value: ByteArray) = opResult(db) {
-        sqlite3_bind_blob(stmtPointer, index, value.refTo(0), value.size, SQLITE_TRANSIENT)
+        if (value.isEmpty()) {
+            sqlite3_bind_zeroblob(stmtPointer, index, 0)
+        } else {
+            sqlite3_bind_blob(stmtPointer, index, value.refTo(0), value.size, SQLITE_TRANSIENT)
+        }
     }
 
     private inline fun opResult(db: SqliteDatabase, block: () -> Int) {

sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeStatementTest.kt

@@ -221,9 +221,7 @@ class NativeStatementTest : BaseDatabaseTest(){
     val TWO_COL_WITH_BLOB = "CREATE TABLE test (num INTEGER NOT NULL, " +
             "blb BLOB NOT NULL)"
 
-//    @Test
-    // Need to review what other drivers do here. It's not acting as expected
-    // https://github.com/touchlab/SQLiter/issues/62
+    @Test
     fun bindEmptyBlob() {
         basicTestDb(TWO_COL_WITH_BLOB) {
             it.withConnection {