AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix delete local cloud (#251)

Browse Source
This commit is contained in:
Julian Raufelder 2021-10-22 17:51:12 +02:00
parent 7add3e5bed
commit f39cc8da7c
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt
View File

@ -453,6 +453,10 @@ class UpgradeDatabaseTest {
.integer("POSITION", 11) // .integer("POSITION", 11) //
.executeOn(db) .executeOn(db)
Sql.query("CLOUD_ENTITY").executeOn(db).use {
Assert.assertThat(it.count, CoreMatchers.`is`(5))
}
Upgrade9To10().applyTo(db, 9) Upgrade9To10().applyTo(db, 9)
Sql.query("VAULT_ENTITY").executeOn(db).use { Sql.query("VAULT_ENTITY").executeOn(db).use {
@ -462,6 +466,9 @@ class UpgradeDatabaseTest {
Assert.assertThat(it.getString(it.getColumnIndex("FOLDER_CLOUD_ID")), CoreMatchers.nullValue()) Assert.assertThat(it.getString(it.getColumnIndex("FOLDER_CLOUD_ID")), CoreMatchers.nullValue())
} }
Sql.query("CLOUD_ENTITY").executeOn(db).use {
Assert.assertThat(it.count, CoreMatchers.`is`(4))
}
} }
} }

5
data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt
View File

@ -1,6 +1,5 @@
package org.cryptomator.data.db package org.cryptomator.data.db
import org.cryptomator.domain.CloudType
import org.greenrobot.greendao.database.Database import org.greenrobot.greendao.database.Database
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@ -18,8 +17,8 @@ internal class Upgrade9To10 @Inject constructor() : DatabaseUpgrade(9, 10) {
.executeOn(db) .executeOn(db)
Sql.deleteFrom("CLOUD_ENTITY") Sql.deleteFrom("CLOUD_ENTITY")
.where("FOLDER_CLOUD_ID", Sql.eq(4)) .where("_id", Sql.eq(4))
.where("TYPE", Sql.eq(CloudType.LOCAL.name)) .where("TYPE", Sql.eq("LOCAL"))
.executeOn(db) .executeOn(db)
db.setTransactionSuccessful() db.setTransactionSuccessful()