Merge branch 'main' into psh/address-warnings

Author: kpgalligan

gradle.properties

@@ -1,6 +1,7 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
+
 VERSION_NAME=1.2.0
 KOTLIN_VERSION=1.7.20-Beta
 

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

@@ -129,7 +129,8 @@ internal class ActualSqliteStatement(private val db: SqliteDatabase, private val
     private inline fun opResult(db: SqliteDatabase, block: () -> Int) {
         val err = block()
         if (err != SQLITE_OK) {
-            throw sqlException(db.logger, db.config, "Sqlite operation failure", err)
+            val error = sqlite3_errmsg(db.dbPointer)?.toKString()
+            throw sqlException(db.logger, db.config, "Sqlite operation failure ${error?:""}", err)
         }
     }
 

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

@@ -40,7 +40,8 @@ internal class SqliteDatabase(path: String, label: String, val logger: Logger, p
     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)
+            val error = sqlite3_errmsg(dbPointer)?.toKString()
+            throw sqlException(logger, config, "error rawExecSql: $sqlString, ${error?:""}", err)
         }
     }
 
@@ -97,8 +98,9 @@ internal fun dbOpen(
     if (lookasideSlotSize >= 0 && lookasideSlotCount >= 0) {
         val err = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE, null, lookasideSlotSize, lookasideSlotCount);
         if (err != SQLITE_OK) {
+            val error = sqlite3_errmsg(db)?.toKString()
             sqlite3_close(db)
-            throw sqlException(logging, SqliteDatabaseConfig(path, label), "Cannot set lookaside : sqlite3_db_config(..., ${lookasideSlotSize}, %${lookasideSlotCount}) failed", err)
+            throw sqlException(logging, SqliteDatabaseConfig(path, label), "Cannot set lookaside : sqlite3_db_config(..., ${lookasideSlotSize}, %${lookasideSlotCount}) failed, ${error?:""}", err)
         }
     }
 

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

@@ -361,6 +361,20 @@ class DatabaseConnectionTest {
         }
     }
 
+    @Test
+    fun rawSqlFails() {
+        basicTestDb(TWO_COL) { databaseManager ->
+            databaseManager.withConnection {
+                try {
+                    it.rawExecSql("INSERT INTO notthere(num, str)values(3,'abc')")
+                    fail("Should have thrown")
+                } catch (e: Exception) {
+                    assertTrue(e.message?.contains("no such table: notthere") ?: false)
+                }
+            }
+        }
+    }
+
     private fun checkDbIsFile(memoryName: String?, mem:Boolean): Boolean {
         var dbFileExists = false
         val checkName = memoryName ?: ":memory:"

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

@@ -24,7 +24,7 @@ import kotlin.test.*
 
 class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
-    @Test
+//    @Test
     fun multithreadedActivityWAL() {
         multithreadedActivity(JournalMode.WAL)
     }

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

@@ -262,5 +262,25 @@ class NativeStatementTest : BaseDatabaseTest(){
             }
         }
     }
+
+    @Test
+    fun failBindExtendedMessage() {
+        basicTestDb(TWO_COL) {
+            val errorMessage = try {
+                it.withConnection {
+                    it.withStatement("insert into test(num, str)values(?,?)") {
+                        bindLong(1, 21)
+                        bindString(3, "asdf")
+                        executeInsert()
+                    }
+                }
+                ""
+            } catch (e: Exception) {
+                e.message ?: ""
+            }
+
+            assertTrue(errorMessage.contains("column index out of range"))
+        }
+    }
 }