Merging

Author: kpgalligan

KotlinCpp/bcdist/mingw_x64/tlruntime.bc

@@ -20,14 +20,18 @@ import org.jetbrains.kotlin.CompileCppToBitcode
 
 targetList.each { targetName ->
     if(
-    targetName.contains("ios") || targetName.contains("macos")
+    targetName.contains("ios") || targetName.contains("macos") || targetName.contains("mingw")
     ) {
         task("${targetName}TLRuntime", type: CompileCppToBitcode) {
             name "tlruntime"
             srcRoot file('src/main')
             target targetName
-            if (!isWindows())
+            if (!isWindows()) {
                 compilerArgs '-fPIC'
+            } else {
+                // When compiling on windows you need to have installed msys2, then use that to install sqlite3
+                compilerArgs '-Ic:\\msys64\\mingw64\\include'
+            }
             compilerArgs '-I' + project.file("${konanDevPath}/common/src/hash/headers")
             compilerArgs '-I' + project.file("${konanDevPath}/runtime/src/main/cpp")
             if (rootProject.hasProperty("${targetName}LibffiDir"))
@@ -37,7 +41,8 @@ targetList.each { targetName ->
 }
 
 task distTlRuntime(type: Copy) {
-    dependsOn.addAll(targetList.findAll {it.contains("ios") || it.contains("macos")}.collect { "${it}TLRuntime" })
+    dependsOn.addAll(targetList.findAll {it.contains("ios") || it.contains("macos") || it.contains("mingw")}
+             .collect { "${it}TLRuntime" })
 }
 
 

KotlinCpp/bcdist/mingw_x64/tlruntime/KonanHelper.bc

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-
+#include <stdarg.h>
 
 #include <iterator>
 #include <string>
@@ -42,8 +42,6 @@
 
 #include "utf8.h"
 
-#include <dispatch/dispatch.h>
-
 extern "C" {
 //TODO: Review everything that uses this and make sure we need
 char *CreateCStringFromStringWithSize(KString kstring, size_t *utf8Size) {

KotlinCpp/bcdist/mingw_x64/tlruntime/SQLiteCommon.bc

@@ -26,7 +26,6 @@
 #include "utf8.h"
 
 #include <stdlib.h>
-#include <sys/mman.h>
 
 #include <string.h>
 #include <unistd.h>
@@ -315,6 +314,10 @@ KLong SQLiter_SQLiteConnection_nativeOpen(KString pathStr, KInt openFlags,
         sqliteFlags = SQLITE_OPEN_READWRITE;
     }
 
+    // This ensures that regardless of how sqlite was compiled it will support uri file paths.
+    // this is important for using in memory databases.
+    sqliteFlags |= SQLITE_OPEN_URI;
+
     size_t utf8Size;
     char * path = CreateCStringFromStringWithSize(pathStr, &utf8Size);
     char * label = CreateCStringFromStringWithSize(labelStr, &utf8Size);

KotlinCpp/bcdist/mingw_x64/tlruntime/SQLiteConnection.bc

@@ -13,7 +13,6 @@ buildscript {
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 repositories {
-//    mavenLocal()
     mavenCentral()
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -37,6 +36,16 @@ kotlin {
             }
         }
 
+        fromPreset(presets.mingwX64, 'mingw'){
+            compilations.each {
+                it.extraOpts("-linker-options", "-Lc:\\msys64\\mingw64\\lib")
+                it.extraOpts("-linker-options", "-lsqlite3")
+            }
+            compilations.test {
+                it.extraOpts("-native-library", "../KotlinCpp/bcdist/mingw_x64/tlruntime.bc")
+            }
+        }
+
         fromPreset(presets.iosX64, 'iosX64'){
             compilations.test {
                 it.extraOpts("-linker-options", "-lsqlite3")
@@ -83,6 +92,11 @@ kotlin {
                 implementation 'org.jetbrains.kotlin:kotlin-test-junit'
             }
         }
+        mingwMain {
+            dependencies {
+                implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+            }
+        }
 
         nativeCommonMain { }
         nativeCommonTest { }
@@ -91,11 +105,15 @@ kotlin {
             dependsOn nativeCommonMain
         }
 
+        configure([mingwMain]) {
+            dependsOn nativeCommonMain
+        }
+
         configure([iosX64Main, iosArm64Main, macosMain, iosArm32Main]) {
             dependsOn appleMain
         }
 
-        configure([iosX64Test, iosArm64Test, macosTest, iosArm32Test]) {
+        configure([iosX64Test, iosArm64Test, macosTest, iosArm32Test, mingwTest]) {
             dependsOn nativeCommonTest
         }
     }
@@ -125,6 +143,7 @@ task mergeCppAll(dependsOn:build) {
         mergeCppOutput("iosArm64", "ios_arm64")
         mergeCppOutput("iosX64", "ios_x64")
         mergeCppOutput("macos", "macos_x64")
+        mergeCppOutput("mingw", "mingw_x64")
     }
 }
 

KotlinCpp/knarch/build.gradle

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

KotlinCpp/knarch/src/main/cpp/KonanHelper.cpp

@@ -0,0 +1,47 @@
+package co.touchlab.sqliter
+
+import co.touchlab.sqliter.internal.File
+import co.touchlab.sqliter.internal.FileFilter
+import co.touchlab.sqliter.internal.Utils
+
+actual object DatabaseFileContext {
+    actual fun deleteDatabase(name: String, basePath:String?) {
+        deleteDatabaseFile(databaseFile(name, basePath))
+    }
+
+    internal fun databasePath(databaseName:String, inMemory:Boolean, datapathPath:String?):String {
+        return if(inMemory) {
+            "file:$databaseName?mode=memory&cache=shared"
+        } else {
+            databaseFile(databaseName, datapathPath).path
+        }
+    }
+
+    internal fun databaseFile(databaseName:String, datapathPath:String?):File {
+        return File(datapathPath ?: Utils.getUserDirectory(), databaseName)
+    }
+
+    internal fun deleteDatabaseFile(file:File):Boolean {
+        var deleted = false
+        deleted = deleted or file.delete()
+        deleted = deleted or File(file.getPath() + "-journal").delete()
+        deleted = deleted or File(file.getPath() + "-shm").delete()
+        deleted = deleted or File(file.getPath() + "-wal").delete()
+
+        val dir = file.getParentFile()
+        if (dir != null) {
+            val prefix = file.getName() + "-mj"
+            val files = dir.listFiles(object: FileFilter {
+                override fun accept(candidate: File):Boolean {
+                    return candidate.getName().startsWith(prefix)
+                }
+            })
+            if (files != null) {
+                for (masterJournal in files) {
+                    deleted = deleted or masterJournal.delete()
+                }
+            }
+        }
+        return deleted
+    }
+}