Skip to content

Handle file:// url prefix when fixing the databasePath #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2022
Merged

Handle file:// url prefix when fixing the databasePath #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/internal/File.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ internal actual class File(dirPath:String?=null, name:String){
val newPath:CharArray = origPath.toCharArray()
val length = newPath.size
var newLength = 0
for (i in 0 until length) {
val initialIndex = if (origPath.startsWith("file://", true)) 7 else 0
for (i in initialIndex until length) {
val ch = newPath[i]
if (ch == '/') {
if (!lastWasSlash) {
Expand All @@ -93,15 +94,12 @@ internal actual class File(dirPath:String?=null, name:String){
if (lastWasSlash && newLength > 1) {
newLength--
}

// Reuse the original string if possible.
return if (newLength != length) {
val sb = StringBuilder(newLength)
sb.append(newPath)
sb.toString()
}
else {
origPath
}
return if (newLength != length) buildString(newLength) {
append(newPath)
setLength(newLength)
} else origPath
}

private fun join(prefix: String, suffix: String): String {
Expand Down
13 changes: 7 additions & 6 deletions sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/internal/File.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ internal actual class File(dirPath: String? = null, name: String) {
val newPath: CharArray = origPath.toCharArray()
val length = newPath.size
var newLength = 0
for (i in 0 until length) {
val initialIndex = if (origPath.startsWith("file://", true)) 7 else 0
for (i in initialIndex until length) {
val ch = newPath[i]
if (ch == '/') {
if (!lastWasSlash) {
Expand All @@ -110,12 +111,12 @@ internal actual class File(dirPath: String? = null, name: String) {
if (lastWasSlash && newLength > 1) {
newLength--
}

// Reuse the original string if possible.
return if (newLength != length) {
newPath.concatToString()
} else {
origPath
}
return if (newLength != length) buildString(newLength) {
append(newPath)
setLength(newLength)
} else origPath
}

private fun join(prefix: String, suffix: String): String {
Expand Down
14 changes: 8 additions & 6 deletions sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/internal/File.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ internal actual class File(dirPath:String? = null, name:String) {
val newPath:CharArray = origPath.toCharArray()
val length = newPath.size
var newLength = 0
for (ch in newPath) {
val initialIndex = if (origPath.startsWith("file://", true)) 7 else 0
for (i in initialIndex until length) {
val ch = newPath[i]
if (ch == separatorChar) {
if (!lastWasSlash) {
newPath[newLength++] = separatorChar
Expand All @@ -94,12 +96,12 @@ internal actual class File(dirPath:String? = null, name:String) {
if (lastWasSlash && newLength > 1) {
newLength--
}

// Reuse the original string if possible.
return if (newLength != length) {
newPath.concatToString()
} else {
origPath
}
return if (newLength != length) buildString(newLength) {
append(newPath)
setLength(newLength)
} else origPath
}

/**
Expand Down
18 changes: 18 additions & 0 deletions sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConfigurationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
assertTrue(dbPathString.endsWith(TEST_DB_NAME))
}

@Test
fun databasePathRemovesExtraSlashes() {
val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, "//tmp//")
assertEquals("/tmp/$TEST_DB_NAME", dbPathString)
}

@Test
fun databasePathRemovesFileUrlPrefix() {
val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, "file:///tmp/")
assertEquals("/tmp/$TEST_DB_NAME", dbPathString)
}

@Test
fun databasePathRemovesFileUrlPrefixInCaps() {
val dbPathString = DatabaseFileContext.databasePath(TEST_DB_NAME, "FILE:///tmp/")
assertEquals("/tmp/$TEST_DB_NAME", dbPathString)
}

@Test
fun memoryOnlyTest(){
val conf = DatabaseConfiguration(
Expand Down