From 36f7b800024a5c89f98195778758dbb65090e3f5 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Sun, 31 Jan 2021 23:20:47 +0100
Subject: [PATCH] Preserve vault passwords as well while updating the database
 schema

---
 data/src/main/java/org/cryptomator/data/db/Upgrade3To4.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/src/main/java/org/cryptomator/data/db/Upgrade3To4.kt b/data/src/main/java/org/cryptomator/data/db/Upgrade3To4.kt
index 5ecb6cb2..8c011b7e 100644
--- a/data/src/main/java/org/cryptomator/data/db/Upgrade3To4.kt
+++ b/data/src/main/java/org/cryptomator/data/db/Upgrade3To4.kt
@@ -14,7 +14,7 @@ internal class Upgrade3To4 @Inject constructor() : DatabaseUpgrade(3, 4) {
 	override fun internalApplyTo(db: Database, origin: Int) {
 		db.beginTransaction()
 		try {
-			upgradeDatabaseScheme(db)
+			upgradeDatabaseSchema(db)
 			updateVaultPositions(db)
 			db.setTransactionSuccessful()
 		} finally {
@@ -22,7 +22,7 @@ internal class Upgrade3To4 @Inject constructor() : DatabaseUpgrade(3, 4) {
 		}
 	}
 
-	private fun upgradeDatabaseScheme(db: Database) {
+	private fun upgradeDatabaseSchema(db: Database) {
 		Sql.alterTable("VAULT_ENTITY").renameTo("VAULT_ENTITY_OLD").executeOn(db)
 		Sql.createTable("VAULT_ENTITY") //
 				.id() //
@@ -36,8 +36,8 @@ internal class Upgrade3To4 @Inject constructor() : DatabaseUpgrade(3, 4) {
 				.executeOn(db)
 
 		Sql.insertInto("VAULT_ENTITY") //
-				.select("_id", "FOLDER_CLOUD_ID", "FOLDER_PATH", "FOLDER_NAME", "CLOUD_ENTITY.TYPE") //
-				.columns("_id", "FOLDER_CLOUD_ID", "FOLDER_PATH", "FOLDER_NAME", "CLOUD_TYPE") //
+				.select("_id", "FOLDER_CLOUD_ID", "FOLDER_PATH", "FOLDER_NAME", "PASSWORD", "CLOUD_ENTITY.TYPE") //
+				.columns("_id", "FOLDER_CLOUD_ID", "FOLDER_PATH", "FOLDER_NAME", "PASSWORD", "CLOUD_TYPE") //
 				.from("VAULT_ENTITY_OLD") //
 				.join("CLOUD_ENTITY", "VAULT_ENTITY_OLD.FOLDER_CLOUD_ID") //
 				.executeOn(db)