From f39cc8da7ca2ecbdf0dfd182b0ddf65098a61a72 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 22 Oct 2021 17:51:12 +0200 Subject: [PATCH] Fix delete local cloud (#251) --- .../java/org/cryptomator/data/db/UpgradeDatabaseTest.kt | 7 +++++++ data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt b/data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt index c494bc2a..6de195db 100644 --- a/data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt +++ b/data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt @@ -453,6 +453,10 @@ class UpgradeDatabaseTest { .integer("POSITION", 11) // .executeOn(db) + Sql.query("CLOUD_ENTITY").executeOn(db).use { + Assert.assertThat(it.count, CoreMatchers.`is`(5)) + } + Upgrade9To10().applyTo(db, 9) Sql.query("VAULT_ENTITY").executeOn(db).use { @@ -462,6 +466,9 @@ class UpgradeDatabaseTest { 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)) + } } } diff --git a/data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt b/data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt index 7446aaa1..1ea5269a 100644 --- a/data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt +++ b/data/src/main/java/org/cryptomator/data/db/Upgrade9To10.kt @@ -1,6 +1,5 @@ package org.cryptomator.data.db -import org.cryptomator.domain.CloudType import org.greenrobot.greendao.database.Database import javax.inject.Inject import javax.inject.Singleton @@ -18,8 +17,8 @@ internal class Upgrade9To10 @Inject constructor() : DatabaseUpgrade(9, 10) { .executeOn(db) Sql.deleteFrom("CLOUD_ENTITY") - .where("FOLDER_CLOUD_ID", Sql.eq(4)) - .where("TYPE", Sql.eq(CloudType.LOCAL.name)) + .where("_id", Sql.eq(4)) + .where("TYPE", Sql.eq("LOCAL")) .executeOn(db) db.setTransactionSuccessful()