Version 0.6.3

Author: kpgalligan

.gitignore

@@ -54,3 +54,5 @@ backend.native/tests/teamcity-test.property
 # Sample output
 samples/**/*.kt.bc-build
 samples/androidNativeActivity/Polyhedron
+
+.vscode

SQLager/build.gradle

@@ -3,6 +3,7 @@ buildscript {
         jcenter()
         google()
         gradlePluginPortal()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
 
     dependencies {
@@ -14,6 +15,8 @@ apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 repositories {
     mavenCentral()
+    mavenLocal()
+    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
@@ -64,7 +67,7 @@ kotlin {
             dependencies {
                 implementation 'org.jetbrains.kotlin:kotlin-test-common'
                 implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
-                implementation "co.touchlab:testhelp"
+                implementation "co.touchlab:testhelp:$TESTHELP_VERSION"
             }
         }
         /*jvmMain {

SQLager/gradle.properties

@@ -17,12 +17,12 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.1.2-SNAPSHOT
+VERSION_NAME=0.2.0-eap-32
 
-STATELY_VERSION=0.5.1
-TESTHELP_VERSION=0.1.0
-SQLITER_VERSION=0.5.9
-KOTLIN_VERSION=1.3.10
+STATELY_VERSION=0.7.3-eap-32
+TESTHELP_VERSION=0.2.3-eap-32
+SQLITER_VERSION=0.6.3-eap-32
+KOTLIN_VERSION=1.3.40-eap-32
 
 POM_URL=https://github.com/touchlab/SQLiter
 POM_DESCRIPTION=Simple User-friendly Library

SQLager/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

SQLiter/build.gradle

@@ -160,8 +160,6 @@ task mergeCppAll(dependsOn:build) {
     }
 }
 
-
-
 apply from: "$rootDir/gradle/gradle-mvn-mpp-push.gradle"
 
 tasks.findByName("publish").dependsOn("mergeCppAll")

SQLiter/gradle.properties

@@ -17,10 +17,10 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.6.2
+VERSION_NAME=0.6.3
 
-STATELY_VERSION=0.7.2
-KOTLIN_VERSION=1.3.31
+STATELY_VERSION=0.7.3
+KOTLIN_VERSION=1.3.40
 
 POM_URL=https://github.com/touchlab/SQLiter
 POM_DESCRIPTION=Simple SQLite Driver

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/DatabaseConfiguration.kt

@@ -23,6 +23,7 @@ data class DatabaseConfiguration(
     val create: (DatabaseConnection) -> Unit,
     val upgrade: (DatabaseConnection, Int, Int) -> Unit = { _, _, _ -> },
     val journalMode: JournalMode = JournalMode.WAL,
+    val foreignKeyConstraints: Boolean = false,
     val busyTimeout: Int = 2500,
     val pageSize: Int? = null,
     val inMemory: Boolean = false,

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/DatabaseConnection.kt

@@ -79,4 +79,9 @@ fun DatabaseConnection.updateJournalMode(value: JournalMode):JournalMode{
     }else{
         value
     }
+}
+
+fun DatabaseConnection.updateForeignKeyConstraints(enabled: Boolean){
+    val newValue = if(enabled){1}else{0}
+    withStatement("PRAGMA foreign_keys=$newValue") { execute() }
 }

SQLiter/src/nativeCommonMain/kotlin/co/touchlab/sqliter/NativeDatabaseManager.kt

@@ -56,6 +56,10 @@ class NativeDatabaseManager(private val path:String,
                 configuration.busyTimeout
             ))
 
+            if(configuration.foreignKeyConstraints){
+                conn.updateForeignKeyConstraints(true)
+            }
+
             if(connectionCount.value == 0){
                 conn.updateJournalMode(configuration.journalMode)
 

SQLiter/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConfigurationTest.kt

@@ -81,9 +81,9 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
             }))
 
         val conn = manager.surpriseMeConnection()
-        println("tr 0")
+
         assertEquals(conn.journalMode, JournalMode.WAL)
-        println("tr 1")
+
         println("Update journal to DELETE result ${conn.updateJournalMode(JournalMode.DELETE)}")
         assertEquals(conn.journalMode, JournalMode.DELETE)
         println("Update journal to WAL result ${conn.updateJournalMode(JournalMode.WAL)}")
@@ -109,5 +109,73 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
         conn2.close()
     }
 
+    @Test
+    fun foreignKeyConstraintsSetting(){
+        runFkTest("fkoff", false)
+        runFkTest("fkon", true)
+    }
+
+    private fun runFkTest(dbname: String, enableFK: Boolean){
+        var bookId = 1
+        fun makeBookWithoutTransaction(conn: DatabaseConnection) =
+            conn.withStatement("insert into book(id, name, author_id)values(${bookId++}, 'Hello Book', 5)") { executeInsert() }
+
+        fun makeBook(conn: DatabaseConnection) {
+            conn.withTransaction { conn ->
+                makeBookWithoutTransaction(conn)
+            }
+        }
+        fun checkAB(conn:DatabaseConnection, expectBooks: Int, expectAuthors: Int){
+            val books = conn.longForQuery("select count(*) from book").toInt()
+            val authors = conn.longForQuery("select count(*) from author").toInt()
+
+            assertEquals(expectBooks, books)
+            assertEquals(expectAuthors, authors)
+        }
+
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = dbname,
+            version = 1,
+            journalMode = JournalMode.WAL,
+            foreignKeyConstraints = enableFK,
+            create = { db ->
+                db.withStatement(AUTHOR) {
+                    execute()
+                }
+                db.withStatement(BOOK) {
+                    execute()
+                }
+            }))
+
+        val conn = manager.createMultiThreadedConnection()
+
+        try {
+            checkAB(conn, 0, 0)
+
+            if(enableFK){
+                assertFails { makeBook(conn) }
+                assertFails { makeBookWithoutTransaction(conn) }
+                checkAB(conn, 0, 0)
+            }else{
+                makeBook(conn)
+                makeBookWithoutTransaction(conn)
+                checkAB(conn, 2, 0)
+            }
+        } finally {
+            conn.close()
+            DatabaseFileContext.deleteDatabase(dbname)
+        }
+    }
 
+    private val AUTHOR = """CREATE TABLE author (
+    id INTEGER NOT NULL PRIMARY KEY,
+    name TEXT NOT NULL
+    );"""
+
+    private val BOOK = """CREATE TABLE book (
+    id INTEGER NOT NULL PRIMARY KEY,
+    name TEXT NOT NULL,
+    author_id INTEGER NOT NULL,
+    FOREIGN KEY (author_id) REFERENCES author(id) ON DELETE CASCADE
+    );"""
 }