From 6bbc281f1b7bef3ee85120b9924df8dc084fe138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Saleniuk?= <30429749+saleniuk@users.noreply.github.com> Date: Wed, 22 Jan 2025 10:24:46 +0100 Subject: [PATCH] Commit with unresolved merge conflicts --- .../src/commonMain/db_user/migrations/96.sqm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/persistence/src/commonMain/db_user/migrations/96.sqm b/persistence/src/commonMain/db_user/migrations/96.sqm index ad012d44dd..f945aea0f3 100644 --- a/persistence/src/commonMain/db_user/migrations/96.sqm +++ b/persistence/src/commonMain/db_user/migrations/96.sqm @@ -1,9 +1,27 @@ +<<<<<<< HEAD DROP TABLE LabeledConversation; CREATE TABLE LabeledConversation ( conversation_id TEXT AS QualifiedIDEntity NOT NULL, folder_id TEXT NOT NULL, +======= +import com.wire.kalium.persistence.dao.QualifiedIDEntity; +import com.wire.kalium.persistence.dao.conversation.folder.ConversationFolderTypeEntity; + +CREATE TABLE IF NOT EXISTS ConversationFolder ( + id TEXT NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + folder_type TEXT AS ConversationFolderTypeEntity NOT NULL +); + + +CREATE TABLE IF NOT EXISTS LabeledConversation ( + conversation_id TEXT AS QualifiedIDEntity NOT NULL, + folder_id TEXT NOT NULL, + + FOREIGN KEY (conversation_id) REFERENCES Conversation(qualified_id) ON DELETE CASCADE ON UPDATE CASCADE, +>>>>>>> 55e6c38055 (fix: wrong migrations order between 4.9 and 4.10 [WPB-15157] (#3238)) FOREIGN KEY (folder_id) REFERENCES ConversationFolder(id) ON DELETE CASCADE ON UPDATE CASCADE, PRIMARY KEY (folder_id, conversation_id)