Skip to content

Commit 4bb5b17

Browse files
committed
Merge branch 'master' of https://github.com/touchlab/SQLiter
2 parents d668fd4 + c1a1680 commit 4bb5b17

File tree

10 files changed

+3
-3
lines changed

10 files changed

+3
-3
lines changed
30 KB
Binary file not shown.
10.1 KB
Binary file not shown.
12.3 KB
Binary file not shown.
18.9 KB
Binary file not shown.
33 KB
Binary file not shown.
10.8 KB
Binary file not shown.
12.9 KB
Binary file not shown.
21.2 KB
Binary file not shown.

SQLiter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ kotlin {
5757

5858
fromPreset(presets.mingwX64, 'mingw'){
5959
compilations.main {
60-
it.kotlinOptions.freeCompilerArgs += ["-native-library", "../KotlinCpp/bcdist/mingw_x64/tlruntime.bc"]
60+
it.kotlinOptions.freeCompilerArgs += ["-native-library", "C:\\Users\\kgalligan\\devel\\SQLiter\\KotlinCpp\\bcdist\\mingw_x64\\tlruntime.bc"]
6161
}
6262
compilations.each {
6363
it.kotlinOptions.freeCompilerArgs += ["-linker-options", "-Lc:\\msys64\\mingw64\\lib"]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fun DatabaseConnection.stringForQuery(sql:String):String = withStatement(sql){
6060
* @param cipherKey the database cipher key
6161
*/
6262
fun DatabaseConnection.setCipherKey(cipherKey: String) {
63-
withStatement("PRAGMA key = \"$cipherKey\";") { execute() }
63+
stringForQuery("PRAGMA key = \"$cipherKey\";")
6464
}
6565

6666
/**
@@ -71,7 +71,7 @@ fun DatabaseConnection.setCipherKey(cipherKey: String) {
7171
*/
7272
fun DatabaseConnection.resetCipherKey(oldKey: String, newKey: String) {
7373
setCipherKey(oldKey)
74-
withStatement("PRAGMA rekey = \"$newKey\";") { execute() }
74+
stringForQuery("PRAGMA rekey = \"$newKey\";")
7575
}
7676

7777
/**

0 commit comments

Comments
 (0)