Merge pull request #36 from touchlab/kpg/closev2_stringoptimization

Kpg/closev2 stringoptimization

Author: kpgalligan

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: build
 on:
   pull_request:
     branches:
-      - main
+      - "**"
   push:
     branches:
-      - main
+      - "**"
 
 jobs:
   build:

gradle/gradle-mvn-mpp-push.gradle

@@ -39,7 +39,10 @@ def getGpgKey() {
 
 signing {
   required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-  useInMemoryPgpKeys(getGpgKey(), "")
+  def gpgKey = getGpgKey()
+  if(gpgKey != "") {
+    useInMemoryPgpKeys(getGpgKey(), "")
+  }
   sign(publishing.publications)
 }
 

runtest.sh

@@ -0,0 +1,3 @@
+#Runs specific test. Pass in test name.
+./gradlew linkDebugTestMacosX64
+./sqliter-driver/build/bin/macosX64/debugTest/test.kexe --ktest_regex_filter=.*$1.*

sqliter-driver/runtest.sh

@@ -0,0 +1,7 @@
+package co.touchlab.sqliter.interop
+
+import kotlinx.cinterop.*
+import platform.Foundation.NSString
+import platform.Foundation.create
+
+actual inline fun bytesToString(bv:CPointer<ByteVar>):String = NSString.create(bv).toString()

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

@@ -0,0 +1,5 @@
+package co.touchlab.sqliter.interop
+
+import kotlinx.cinterop.*
+
+actual inline fun bytesToString(bv:CPointer<ByteVar>):String = bv.toKStringFromUtf8()

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

@@ -24,20 +24,16 @@ data class DatabaseConfiguration(
     val version: Int,
     val create: (DatabaseConnection) -> Unit,
     val upgrade: (DatabaseConnection, Int, Int) -> Unit = { _, _, _ -> },
-    val foreignKeyConstraints: Boolean = false,
-
-    val typeConfig: Type = Type(),
+    val inMemory: Boolean = false,
+    val journalMode: JournalMode = JournalMode.WAL,
     val extendedConfig:Extended = Extended(),
     val loggingConfig:Logging = Logging(),
     val lifecycleConfig:Lifecycle = Lifecycle(),
     val encryptionConfig:Encryption = Encryption()
 ) {
-    data class Type(
-        val journalMode: JournalMode = JournalMode.WAL,
-        val inMemory: Boolean = false
-    )
     data class Extended(
-        val busyTimeout: Int = 2500,
+        val foreignKeyConstraints: Boolean = false,
+        val busyTimeout: Int = 5000,
         val pageSize: Int? = null,
         val basePath: String? = null,
         )

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/DatabaseConfiguration.kt

@@ -22,6 +22,7 @@ interface DatabaseConnection {
     fun setTransactionSuccessful()
     fun endTransaction()
     fun close()
+    val closed:Boolean
 }
 
 fun <R> DatabaseConnection.withStatement(sql: String, proc: Statement.() -> R): R {

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/DatabaseConnection.kt

@@ -34,6 +34,9 @@ class ConcurrentDatabaseConnection(private val delegateConnection:DatabaseConnec
 
     override fun close() = accessLock.withLock { delegateConnection.close() }
 
+    override val closed: Boolean
+        get() = delegateConnection.closed
+
     inner class ConcurrentCursor(private val delegateCursor: Cursor):Cursor{
         override fun next(): Boolean = accessLock.withLock { delegateCursor.next() }
 

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/concurrency/ConcurrentDatabaseConnection.kt

@@ -23,7 +23,7 @@ fun createDatabaseManager(configuration: DatabaseConfiguration): DatabaseManager
     return NativeDatabaseManager(databasePath, configuration)
 }
 
-internal fun diskOrMemoryPath(configuration: DatabaseConfiguration) = if (configuration.typeConfig.inMemory) {
+internal fun diskOrMemoryPath(configuration: DatabaseConfiguration) = if (configuration.inMemory) {
     if (configuration.name == null) {
         ":memory:"
     } else {