diff --git a/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql b/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql index 6ce3303376..6300ccba17 100644 --- a/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql +++ b/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql @@ -23,7 +23,7 @@ SELECT C.Favorite, C.FolderId, C.DeletedDate, - C.ArchivedDate, + CA.ArchivedDate, C.Reprompt, C.[Key], CASE @@ -62,6 +62,8 @@ LEFT JOIN [dbo].[Group] G ON G.[Id] = GU.[GroupId] LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId] +LEFT JOIN + [dbo].[CipherArchive] CA ON CA.[CipherId] = C.[Id] AND CA.[UserId] = @UserId WHERE CU.[CollectionId] IS NOT NULL OR CG.[CollectionId] IS NOT NULL @@ -80,7 +82,7 @@ SELECT C.Favorite, C.FolderId, C.DeletedDate, - C.ArchivedDate, + CA.ArchivedDate, C.Reprompt, C.[Key], 1 [Edit], @@ -89,5 +91,7 @@ SELECT 0 [OrganizationUseTotp] FROM [dbo].[CipherDetails](@UserId) AS C +LEFT JOIN + [dbo].[CipherArchive] CA ON CA.[CipherId] = C.[Id] AND CA.[UserId] = @UserId WHERE C.[UserId] = @UserId; diff --git a/util/Migrator/DbScripts/2025-11-14_00_AddArchiveCipherToCipherDetails.sql b/util/Migrator/DbScripts/2025-11-14_00_AddArchiveCipherToCipherDetails.sql index 8f556ba3a0..27c2763c3b 100644 --- a/util/Migrator/DbScripts/2025-11-14_00_AddArchiveCipherToCipherDetails.sql +++ b/util/Migrator/DbScripts/2025-11-14_00_AddArchiveCipherToCipherDetails.sql @@ -194,7 +194,7 @@ SELECT C.Favorite, C.FolderId, C.DeletedDate, - C.ArchivedDate, + CA.ArchivedDate, C.Reprompt, C.[Key], CASE @@ -233,6 +233,8 @@ LEFT JOIN [dbo].[Group] G ON G.[Id] = GU.[GroupId] LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId] +LEFT JOIN + [dbo].[CipherArchive] CA ON CA.[CipherId] = C.[Id] AND CA.[UserId] = @UserId WHERE CU.[CollectionId] IS NOT NULL OR CG.[CollectionId] IS NOT NULL @@ -251,7 +253,7 @@ SELECT C.Favorite, C.FolderId, C.DeletedDate, - C.ArchivedDate, + CA.ArchivedDate, C.Reprompt, C.[Key], 1 [Edit], @@ -260,6 +262,7 @@ SELECT 0 [OrganizationUseTotp] FROM [dbo].[CipherDetails](@UserId) AS C +LEFT JOIN + [dbo].[CipherArchive] CA ON CA.[CipherId] = C.[Id] AND CA.[UserId] = @UserId WHERE C.[UserId] = @UserId; -GO