SQLiter version 0.5.10

Author: kpgalligan

SQLager/build.gradle

@@ -64,6 +64,7 @@ kotlin {
             dependencies {
                 implementation 'org.jetbrains.kotlin:kotlin-test-common'
                 implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
+                implementation "co.touchlab:testhelp"
             }
         }
         /*jvmMain {

SQLager/gradle.properties

@@ -17,10 +17,11 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.1.1-SNAPSHOT
+VERSION_NAME=0.1.2-SNAPSHOT
 
 STATELY_VERSION=0.5.1
-SQLITER_VERSION=0.5.7-SNAPSHOT
+TESTHELP_VERSION=0.1.0
+SQLITER_VERSION=0.5.9
 KOTLIN_VERSION=1.3.10
 
 POM_URL=https://github.com/touchlab/SQLiter

SQLiter/gradle.properties

@@ -17,7 +17,7 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.5.9
+VERSION_NAME=0.5.10
 
 STATELY_VERSION=0.5.1
 KOTLIN_VERSION=1.3.11
@@ -40,4 +40,7 @@ POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
 POM_DEVELOPER_URL=https://touchlab.co/
 
-BINTRAY_VERSION=1.8.3-kotlin-a1
+BINTRAY_VERSION=1.8.3-kotlin-a1
+
+org.gradle.internal.http.socketTimeout=120000
+org.gradle.internal.http.connectionTimeout=120000

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

@@ -16,27 +16,29 @@
 
 package co.touchlab.sqliter
 
-import co.touchlab.sqliter.Constants.validDatabaseName
-
 data class DatabaseConfiguration(
 
-    val name:String,
-    val version:Int,
-    val create:(DatabaseConnection)->Unit,
-    val upgrade:(DatabaseConnection, Int, Int)->Unit = {_,_,_->},
+    val name: String,
+    val version: Int,
+    val create: (DatabaseConnection) -> Unit,
+    val upgrade: (DatabaseConnection, Int, Int) -> Unit = { _, _, _ -> },
     val journalMode: JournalMode = JournalMode.WAL,
-    val busyTimeout:Int = 2500,
-    val pageSize:Int? = null,
-    val inMemory:Boolean = false
-){
+    val busyTimeout: Int = 2500,
+    val pageSize: Int? = null,
+    val inMemory: Boolean = false,
+    val basePath: String? = null
+) {
     init {
-        if(!validDatabaseName.matches(name))
-            throw IllegalArgumentException("Database name $name not valid. Only letters, numbers, dash and underscore allowed")
+        checkFilename(name)
     }
 }
 
-object Constants{
-    val validDatabaseName = "[A-Za-z0-9\\-_.]+".toRegex()
+private fun checkFilename(name: String) {
+    if (name.contains("/")) {
+        throw IllegalArgumentException(
+            "File $name contains a path separator"
+        )
+    }
 }
 
 enum class JournalMode {

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

@@ -17,5 +17,9 @@
 package co.touchlab.sqliter
 
 expect object DatabaseFileContext{
-    fun deleteDatabase(name: String)
+    fun deleteDatabase(name: String, basePath:String? = null)
+}
+
+fun DatabaseFileContext.deleteDatabase(configuration: DatabaseConfiguration){
+    deleteDatabase(configuration.name, configuration.basePath)
 }

SQLiter/src/jvmMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt

@@ -17,5 +17,5 @@
 package co.touchlab.sqliter
 
 actual object DatabaseFileContext {
-    actual fun deleteDatabase(name: String) {}
+    actual fun deleteDatabase(name: String, basePath:String?) {}
 }

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

@@ -24,15 +24,15 @@ import platform.Foundation.NSSearchPathForDirectoriesInDomains
 import platform.Foundation.NSUserDomainMask
 
 actual object DatabaseFileContext{
-    actual fun deleteDatabase(name: String) {
-        deleteDatabaseFile(databaseFile(name))
+    actual fun deleteDatabase(name: String, basePath:String?) {
+        deleteDatabaseFile(databaseFile(name, basePath))
     }
 
-    internal fun databasePath(databaseName:String, inMemory:Boolean):String{
+    internal fun databasePath(databaseName:String, inMemory:Boolean, datapathPath:String?):String{
         return if(inMemory){
             "file:$databaseName?mode=memory&cache=shared"
         }else{
-            File(databaseDirPath(), databaseName).path
+            databaseFile(databaseName, datapathPath).path
         }
     }
 
@@ -52,7 +52,7 @@ actual object DatabaseFileContext{
         return databaseDirectory
     }
 
-    internal fun databaseFile(databaseName:String):File = File(databaseDirPath(), databaseName)
+    internal fun databaseFile(databaseName:String, datapathPath:String?):File = File(datapathPath?:databaseDirPath(), databaseName)
 
     internal fun deleteDatabaseFile(file:File):Boolean {
         var deleted = false

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

@@ -17,6 +17,6 @@
 package co.touchlab.sqliter
 
 fun createDatabaseManager(configuration: DatabaseConfiguration): DatabaseManager {
-    val databasePath = DatabaseFileContext.databasePath(configuration.name, configuration.inMemory)
+    val databasePath = DatabaseFileContext.databasePath(configuration.name, configuration.inMemory, configuration.basePath)
     return NativeDatabaseManager(databasePath, configuration)
 }

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

@@ -16,42 +16,66 @@
 
 package co.touchlab.sqliter
 
+import platform.Foundation.NSFileManager
 import kotlin.test.*
-import co.touchlab.sqliter.Constants.validDatabaseName
 
 class DatabaseConfigurationTest : BaseDatabaseTest(){
 
     @Test
     fun pathTest(){
-        val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, false)
+        val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, false, null)
         assertTrue(dbPathString.endsWith(TEST_DB_NAME))
     }
 
     @Test
     fun memoryPathTest(){
-        val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, true)
+        val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, true, null)
         assertEquals("file:$TEST_DB_NAME?mode=memory&cache=shared", dbPathString)
     }
 
+    fun checkFilePath(name: String, path: String?) {
+        var conn: DatabaseConnection? = null
+        val config = DatabaseConfiguration(name = name, basePath = path, version = 1, create = { db ->
+            db.withStatement(TWO_COL) {
+                execute()
+            }
+        })
+
+        try {
+            val expectedPath = DatabaseFileContext.databaseFile(name, path)
+            val manager = createDatabaseManager(config)
+
+            conn = manager.createMultiThreadedConnection()
+
+            assertTrue(expectedPath.exists())
+        } finally {
+            conn?.close()
+            DatabaseFileContext.deleteDatabase(config)
+        }
+    }
+
     @Test
-    fun validDatabaseName(){
-        assertTrue(validDatabaseName.matches("absdf"))
-        assertTrue(validDatabaseName.matches("abs4f"))
-        assertTrue(validDatabaseName.matches("abWWs4f"))
-        assertTrue(validDatabaseName.matches("_-abWWs4f"))
-        assertTrue(validDatabaseName.matches("_-ab.WWs4f"))
-        assertFalse(validDatabaseName.matches("_-a bWWs4f"))
-        assertFalse(validDatabaseName.matches("_-a ~bWWs4f"))
-        assertFalse(validDatabaseName.matches("_-a ~bWWs4f"))
+    fun noSlashInName(){
+        assertFails {
+            checkFilePath("arst/qwfp", null)
+        }
     }
 
     @Test
-    fun invalidDatabaseNameFailsConfig() {
-        DatabaseConfiguration("asdf", 1, {})
-        assertFails { DatabaseConfiguration("as df", 1, {}) }
+    fun basicDbNameWorks(){
+        checkFilePath("arst", null)
     }
 
+    @Test
+    fun nameWithSpace(){
+        checkFilePath("ar st", null)
+    }
 
+    @Test
+    fun dbWithBasePath(){
+        val basePath = DatabaseFileContext.iosDirPath("notdatabases")
+        checkFilePath("arst", basePath)
+    }
 
     @Test
     fun journalModeSetting()

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

@@ -323,7 +323,7 @@ class DatabaseConnectionTest {
                     }
                 }
 
-                dbFileExists = DatabaseFileContext.databaseFile(memoryName).exists()
+                dbFileExists = DatabaseFileContext.databaseFile(memoryName, null).exists()
             }
         } finally {
             DatabaseFileContext.deleteDatabase(memoryName)