Added rawExecSql and a little warning cleanup

Author: kpgalligan

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/internal/File.kt

@@ -44,38 +44,15 @@ internal actual class File(dirPath:String?=null, name:String){
          * This field is initialized from the system property "file.separator".
          * Later changes to that property will have no effect on this field or this class.
          */
-        var separatorChar: Char = '/'
+        val separatorChar: Char = '/'
 
         /**
          * The system-dependent string used to separate components in filenames ('/').
          * See [.separatorChar].
          */
-        var separator: String = "/"
+        val separator: String = "/"
 
-        /**
-         * The system-dependent character used to separate components in search paths (':').
-         * This is used to split such things as the PATH environment variable and classpath
-         * system properties into lists of directories to be searched.
-         *
-         *
-         * This field is initialized from the system property "path.separator".
-         * Later changes to that property will have no effect on this field or this class.
-         */
-        var pathSeparatorChar: Char = ':'
-
-        /**
-         * The system-dependent string used to separate components in search paths (":").
-         * See [.pathSeparatorChar].
-         */
-        var pathSeparator: String = ":"
-
-        private var caseSensitive: Boolean = true
-
-//        separatorChar = System.getProperty("file.separator", "/").charAt(0);
-//        pathSeparatorChar = System.getProperty("path.separator", ":").charAt(0);
-//        separator = String.valueOf(separatorChar);
-//        pathSeparator = String.valueOf(pathSeparatorChar);
-//        caseSensitive = isCaseSensitiveImpl();
+        private val caseSensitive: Boolean = true
     }
 
     /**

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

@@ -17,6 +17,7 @@
 package co.touchlab.sqliter
 
 interface DatabaseConnection {
+    fun rawExecSql(sql: String)
     fun createStatement(sql: String): Statement
     fun beginTransaction()
     fun setTransactionSuccessful()

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

@@ -24,6 +24,8 @@ import co.touchlab.sqliter.Statement
 class ConcurrentDatabaseConnection(private val delegateConnection:DatabaseConnection):DatabaseConnection{
     private val accessLock = Lock()
 
+    override fun rawExecSql(sql: String) = accessLock.withLock { delegateConnection.rawExecSql(sql) }
+
     override fun createStatement(sql: String): Statement = accessLock.withLock { ConcurrentStatement(delegateConnection.createStatement(sql)) }
 
     override fun beginTransaction() = accessLock.withLock { delegateConnection.beginTransaction() }

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

@@ -35,6 +35,13 @@ class SqliteDatabase(path:String, label:String, val logger: Logger, private val
         }
     }
 
+    fun rawExecSql(sqlString: String){
+        val err = sqlite3_exec(dbPointer, sqlString, null, null, null)
+        if (err != SQLITE_OK) {
+            throw sqlException(logger, config, "error rawExecSql: $sqlString", err)
+        }
+    }
+
     fun close(){
         logger.v { "close $config" }
 

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

@@ -36,6 +36,10 @@ class NativeDatabaseConnection(
 
     data class Transaction(val successful: Boolean)
 
+    override fun rawExecSql(sql: String) {
+        sqliteDatabase.rawExecSql(sql)
+    }
+
     override fun createStatement(sql: String): Statement {
         val statementPtr = sqliteDatabase.prepareStatement(sql)
         val statement = NativeStatement(this, statementPtr, sql)

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

@@ -171,8 +171,8 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
             conn.withStatement("insert into book(id, name, author_id)values(${bookId++}, 'Hello Book', 5)") { executeInsert() }
 
         fun makeBook(conn: DatabaseConnection) {
-            conn.withTransaction { conn ->
-                makeBookWithoutTransaction(conn)
+            conn.withTransaction { conn2 ->
+                makeBookWithoutTransaction(conn2)
             }
         }
         fun checkAB(conn:DatabaseConnection, expectBooks: Int, expectAuthors: Int){

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

@@ -351,6 +351,16 @@ class DatabaseConnectionTest {
         }
     }
 
+    @Test
+    fun rawSqlInsert() {
+        basicTestDb(TWO_COL) { databaseManager ->
+            databaseManager.withConnection {
+                it.rawExecSql("INSERT INTO test(num, str)values(3,'abc')")
+                assertEquals(1, it.longForQuery("select count(*) from test"))
+            }
+        }
+    }
+
     private fun checkDbIsFile(memoryName: String?, mem:Boolean): Boolean {
         var dbFileExists = false
         val checkName = memoryName ?: ":memory:"

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

@@ -179,7 +179,7 @@ class DatabaseManagerTest : BaseDatabaseTest(){
 
         //Upgrade to v2 fails
         assertFails { createDatabaseManager(configUpgradeFails).withConnection {  } }
-        val configUpgrade = configUpgradeFails.copy(upgrade = {conn, from, to ->
+        val configUpgrade = configUpgradeFails.copy(upgrade = {conn, _,_ ->
             conn.withStatement("CREATE TABLE test2 (num INTEGER NOT NULL, " +
                     "str TEXT NOT NULL)"){execute()}
             conn.withStatement("insert into test2(num, str)values(?,?)"){

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

@@ -348,7 +348,7 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
         val conn = manager.createMultiThreadedConnection()
         val stmt = conn.createStatement("select * from test")
-        val cursor = stmt.query()
+        stmt.query()
 
         //After connection close, we should still be able to finalize statements
         conn.close()
@@ -380,7 +380,7 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
                     execute()
                 }
             },
-            upgrade = {dc, oldv, newv ->
+            upgrade = {_,_,_ ->
                 throw IllegalStateException("This shouldn't happen")
             },
             extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)
@@ -391,21 +391,23 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
         val config2 = config1.copy(
             version = 2,
-            create = { db ->
+            create = {
                 throw IllegalStateException("This shouldn't happen")
             },
-            upgrade = {dc, oldv, newv ->
+            upgrade = {_,_,_ ->
                 if(!upgradeCalled.compareAndSet(0, 1))
                     throw IllegalStateException("Multiple upgrade calls")
             }
         )
 
         val workers = (0 until 20).map { Worker.start(errorReporting = true, name = "Test Worker $it") }
-        val futures = workers.map { it.execute(TransferMode.SAFE, {config2.freeze()}){
-            val manager = createDatabaseManager(it)
-            val conn = manager.createMultiThreadedConnection()
-            conn.close()
-        } }
+        val futures = workers.map { worker ->
+            worker.execute(TransferMode.SAFE, { config2.freeze() }) {
+                val managerInner = createDatabaseManager(it)
+                val conn = managerInner.createMultiThreadedConnection()
+                conn.close()
+            }
+        }
 
         futures.forEach {
             it.result

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

@@ -217,5 +217,50 @@ 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
+    fun bindEmptyBlob() {
+        basicTestDb(TWO_COL_WITH_BLOB) {
+            it.withConnection {
+                it.withStatement("insert into test(num, blb)values(?,?)") {
+                    bindLong(1, 22)
+                    bindBlob(2, ByteArray(0){it.toByte()})
+                    executeInsert()
+                }
+
+                it.withStatement("select blb from test") {
+                    val query = query()
+                    query.next()
+                    assertEquals(query.getBytes(query.columnNames["blb"]!!).size, 0)
+                }
+            }
+        }
+    }
+
+    @Test
+    fun bindBlob() {
+        basicTestDb(TWO_COL_WITH_BLOB) {
+            it.withConnection {
+                it.withTransaction {
+                    it.withStatement("insert into test(num, blb)values(?,?)") {
+                        bindLong(1, 22)
+                        bindBlob(2, ByteArray(10){it.toByte()})
+                        executeInsert()
+                    }
+                }
+
+                it.withStatement("select blb from test") {
+                    val query = query()
+                    query.next()
+                    assertEquals(query.getBytes(query.columnNames["blb"]!!).size, 10)
+                }
+            }
+        }
+    }
 }