Merge pull request #73 from DanielRBaird/daniel/exposeDbPointer

Expose database pointer

Author: kpgalligan

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

@@ -16,6 +16,8 @@
 
 package co.touchlab.sqliter
 
+import co.touchlab.sqliter.interop.SqliteDatabasePointer
+
 interface DatabaseConnection {
     fun rawExecSql(sql: String)
     fun createStatement(sql: String): Statement
@@ -24,6 +26,7 @@ interface DatabaseConnection {
     fun endTransaction()
     fun close()
     val closed:Boolean
+    fun getDbPointer(): SqliteDatabasePointer
 }
 
 fun <R> DatabaseConnection.withStatement(sql: String, proc: Statement.() -> R): R {

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

@@ -20,6 +20,7 @@ import co.touchlab.sqliter.Cursor
 import co.touchlab.sqliter.DatabaseConnection
 import co.touchlab.sqliter.FieldType
 import co.touchlab.sqliter.Statement
+import co.touchlab.sqliter.interop.SqliteDatabasePointer
 
 internal class ConcurrentDatabaseConnection(private val delegateConnection: DatabaseConnection) : DatabaseConnection {
     private val accessLock = Lock()
@@ -40,6 +41,8 @@ internal class ConcurrentDatabaseConnection(private val delegateConnection: Data
     override val closed: Boolean
         get() = delegateConnection.closed
 
+    override fun getDbPointer(): SqliteDatabasePointer = delegateConnection.getDbPointer()
+
     inner class ConcurrentCursor(private val delegateCursor: Cursor) : Cursor {
         override fun next(): Boolean = accessLock.withLock { delegateCursor.next() }
 

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

@@ -5,7 +5,7 @@ import cnames.structs.sqlite3_stmt
 import kotlinx.cinterop.*
 import co.touchlab.sqliter.sqlite3.*
 
-internal class SqliteDatabase(path:String, label:String, val logger: Logger, private val verboseDataCalls: Boolean, val dbPointer:SqliteDatabasePointer) {
+internal class SqliteDatabase(path: String, label: String, val logger: Logger, private val verboseDataCalls: Boolean, val dbPointer: SqliteDatabasePointer) {
     val config = SqliteDatabaseConfig(path, label)
 
     fun prepareStatement(sqlString: String): SqliteStatement {

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/native/NativeDatabaseConnection.kt

@@ -20,6 +20,7 @@ import co.touchlab.sqliter.*
 import co.touchlab.sqliter.concurrency.Lock
 import co.touchlab.sqliter.concurrency.withLock
 import co.touchlab.sqliter.interop.SqliteDatabase
+import co.touchlab.sqliter.interop.SqliteDatabasePointer
 import co.touchlab.sqliter.util.maybeFreeze
 import kotlin.native.concurrent.AtomicInt
 import kotlin.native.concurrent.AtomicReference
@@ -86,6 +87,8 @@ class NativeDatabaseConnection internal constructor(
     override val closed: Boolean
         get() = closedFlag.value != 0
 
+    override fun getDbPointer(): SqliteDatabasePointer = sqliteDatabase.dbPointer
+
     fun migrateIfNeeded(
         create: (DatabaseConnection) -> Unit,
         upgrade: (DatabaseConnection, Int, Int) -> Unit,