Little fixes

Author: kpgalligan

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=1.0.0-a2
+VERSION_NAME=1.0.0-b1
 
 KOTLIN_VERSION=1.4.21
 kotlin.native.ignoreDisabledTargets=true

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/interop/Platform.kt

@@ -4,4 +4,4 @@ import kotlinx.cinterop.*
 import platform.Foundation.NSString
 import platform.Foundation.create
 
-actual inline fun bytesToString(bv:CPointer<ByteVar>):String = NSString.create(bv).toString()
+actual inline fun bytesToString(bv:CPointer<ByteVar>):String = NSString.create(uTF8String = bv).toString()

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

@@ -53,7 +53,7 @@ class ActualSqliteStatement(private val db: SqliteDatabase, internal val stmtPoi
                 return false;
             } else if (err == SQLITE_LOCKED || err == SQLITE_BUSY) {
                 // The table is locked, retry
-                trace_log("Database locked, retrying")
+                traceLogCallback("Database locked, retrying")
                 usleep(1000);
             } else {
                 throw sqlException(db.logger, db.config, "sqlite3_step failed", err)
@@ -142,4 +142,8 @@ class ActualSqliteStatement(private val db: SqliteDatabase, internal val stmtPoi
         }
         return err
     }
+
+    override fun traceLogCallback(message: String) {
+        //No logging
+    }
 } 

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

@@ -2,13 +2,6 @@ package co.touchlab.sqliter.interop
 
 internal const val LOG_TRACE = true
 
-internal inline fun trace_log(s: String) {
-    if (LOG_TRACE) {
-        print("trace - ")
-        println(s)
-    }
-}
-
 interface Logger {
     fun trace(message: String)
     val vActive:Boolean
@@ -17,7 +10,6 @@ interface Logger {
     fun eWrite(message: String, exception: Throwable? = null)
 }
 
-
 inline fun Logger.v(block:()->String){
     if(vActive)
         vWrite(block())

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

@@ -26,4 +26,6 @@ interface SqliteStatement {
     fun bindString(index: Int, value: String)
     fun bindBlob(index: Int, value: ByteArray)
     fun executeNonQuery(): Int
+
+    fun traceLogCallback(message:String)
 }

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

@@ -29,4 +29,8 @@ class TracingSqliteStatement(private val logger: Logger, private val delegate:Sq
     override fun bindString(index: Int, value: String)  = logWrapper("bindString", listOf(index, value)) {delegate.bindString(index, value)}
     override fun bindBlob(index: Int, value: ByteArray)  = logWrapper("bindBlob", listOf(index, value)) {delegate.bindBlob(index, value)}
     override fun executeNonQuery(): Int = logWrapper("executeNonQuery", emptyList()) {delegate.executeNonQuery()}
+    override fun traceLogCallback(message: String) {
+        logger.vWrite(message)
+        delegate.traceLogCallback(message)
+    }
 }

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

@@ -25,6 +25,7 @@ val TEST_DB_NAME = "testdb"
 fun createTestDb(
     name:String = TEST_DB_NAME,
     version:Int = 1,
+    timeout:Int? = null,
     update:(DatabaseConnection, Int, Int)->Unit = {_,_,_->},
     onCreateConnection: (DatabaseConnection) -> Unit = { _ -> },
     onCloseConnection: (DatabaseConnection) -> Unit = { _ -> },
@@ -34,6 +35,10 @@ fun createTestDb(
         deleteDatabase(name)
     } catch (e: Exception) {
     }
+    var extended = DatabaseConfiguration.Extended()
+    if(timeout != null)
+        extended = extended.copy(busyTimeout = timeout)
+
     return createDatabaseManager(DatabaseConfiguration(
         name,
         version,
@@ -42,7 +47,8 @@ fun createTestDb(
         lifecycleConfig = DatabaseConfiguration.Lifecycle(
             onCreateConnection = onCreateConnection,
             onCloseConnection = onCloseConnection
-        )
+        ),
+        extendedConfig = extended
     ))
 }
 
@@ -65,12 +71,14 @@ val FOUR_COL = "CREATE TABLE test (num INTEGER NOT NULL, " +
 
 fun basicTestDb(
     createSql: String = FOUR_COL,
+    timeout: Int? = null,
     onCreateConnection: (DatabaseConnection) -> Unit = { _ -> },
     onCloseConnection: (DatabaseConnection) -> Unit = { _ -> },
     block: (DatabaseManager) -> Unit
 ) {
     val dbname = TEST_DB_NAME
     val dbManager = createTestDb(
+        timeout = timeout,
         onCreateConnection = onCreateConnection,
         onCloseConnection = onCloseConnection
     ) { db ->

sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/concurrency/ConcurrentPlaygroundTest.kt

@@ -0,0 +1,55 @@
+package co.touchlab.sqliter.concurrency
+
+import co.touchlab.sqliter.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class ConcurrentPlaygroundTest {
+    /**
+     * Playing with how connections and transactions interact
+     */
+    @Test
+    fun testLongRead() {
+        basicTestDb(TWO_COL, timeout = 1000) { dbman ->
+            val conn = dbman.createMultiThreadedConnection()
+            val conn2 = dbman.createMultiThreadedConnection()
+
+            insert10(conn)
+
+            val queryStatement = conn.createStatement("select * from test")
+            val cursor = queryStatement.query()
+            cursor.next()
+
+            try {
+                assertEquals(10, countRows(conn2))
+                insert10(conn2)
+                assertEquals(10, countRows(conn))
+                queryStatement.finalizeStatement()
+                assertEquals(20, countRows(conn))
+            } finally {
+
+                conn.close()
+                conn2.close()
+            }
+        }
+    }
+
+    private fun countRows(conn: DatabaseConnection): Long = conn.withStatement("select count(*) from test"){
+        val c = query()
+        c.next()
+        c.getLong(0)
+    }
+
+    private fun insert10(conn: DatabaseConnection) {
+        conn.withTransaction {
+            repeat(10) { i ->
+                it.withStatement("insert into test(num, str)values(?,?)") {
+                    bindLong(1, i.toLong())
+                    bindString(2, "arst $i")
+                    executeInsert()
+                }
+            }
+        }
+    }
+
+}