bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-30 07:03:42 +00:00
Code Issues Releases Wiki Activity

put joins in tvf

Browse Source
This commit is contained in:
jaasen-livefront
2025-11-17 18:01:59 -08:00
parent 5e8f1f134b
commit da0131c552
6 changed files with 56 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Sql/dbo/Vault/Functions/CipherDetails.sql
View File

@@ -27,6 +27,10 @@ SELECT
END [FolderId],
C.[DeletedDate],
C.[Reprompt],
C.[Key]
C.[Key],
CA.[ArchivedDate]
FROM
[dbo].[Cipher] C
LEFT JOIN [dbo].[CipherArchive] CA
ON CA.[CipherId] = C.[Id]
AND CA.[UserId] = @UserId;

4
src/Sql/dbo/Vault/Functions/UserCipherDetails.sql
View File

@@ -23,6 +23,7 @@ SELECT
C.Favorite,
C.FolderId,
C.DeletedDate,
C.ArchivedDate,
C.Reprompt,
C.[Key],
CASE
@@ -79,6 +80,7 @@ SELECT
C.Favorite,
C.FolderId,
C.DeletedDate,
C.ArchivedDate,
C.Reprompt,
C.[Key],
1 [Edit],
@@ -88,4 +90,4 @@ SELECT
FROM
[dbo].[CipherDetails](@UserId) AS C
WHERE
C.[UserId] = @UserId;
C.[UserId] = @UserId;

72
src/Sql/dbo/Vault/Stored Procedures/Cipher/CipherDetails_ReadByIdUserId.sql
View File

@@ -6,44 +6,42 @@ BEGIN
SET NOCOUNT ON;
SELECT
ucd.Id,
ucd.UserId,
ucd.OrganizationId,
ucd.Type,
ucd.Data,
ucd.Attachments,
ucd.CreationDate,
ucd.RevisionDate,
ucd.Favorite,
ucd.FolderId,
ucd.DeletedDate,
ucd.Reprompt,
ucd.[Key],
ucd.OrganizationUseTotp,
MAX(ca.ArchivedDate) AS ArchivedDate,
MAX(ucd.Edit) AS Edit,
MAX(ucd.ViewPassword) AS ViewPassword,
MAX(ucd.Manage) AS Manage
[Id],
[UserId],
[OrganizationId],
[Type],
[Data],
[Attachments],
[CreationDate],
[RevisionDate],
[Favorite],
[FolderId],
[DeletedDate],
[Reprompt],
[Key],
[OrganizationUseTotp],
[ArchivedDate],
MAX([Edit]) AS Edit,
MAX([ViewPassword]) AS ViewPassword,
MAX([Manage]) AS Manage
FROM
[dbo].[UserCipherDetails](@UserId) AS ucd
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = ucd.Id
AND ca.UserId = @UserId
[dbo].[UserCipherDetails](@UserId)
WHERE
ucd.Id = @Id
[Id] = @Id
GROUP BY
ucd.Id,
ucd.UserId,
ucd.OrganizationId,
ucd.Type,
ucd.Data,
ucd.Attachments,
ucd.CreationDate,
ucd.RevisionDate,
ucd.Favorite,
ucd.FolderId,
ucd.DeletedDate,
ucd.Reprompt,
ucd.[Key],
ucd.OrganizationUseTotp;
[Id],
[UserId],
[OrganizationId],
[Type],
[Data],
[Attachments],
[CreationDate],
[RevisionDate],
[Favorite],
[FolderId],
[DeletedDate],
[Reprompt],
[Key],
[OrganizationUseTotp],
[ArchivedDate]
END

6
src/Sql/dbo/Vault/Stored Procedures/Cipher/CipherDetails_ReadByUserId.sql
View File

@@ -5,11 +5,7 @@ BEGIN
SET NOCOUNT ON
SELECT
c.*,
ca.ArchivedDate
c.*
FROM
[dbo].[UserCipherDetails](@UserId) AS c
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = c.Id
AND ca.UserId = @UserId
END

12
src/Sql/dbo/Vault/Stored Procedures/Cipher/CipherDetails_ReadWithoutOrganizationsByUserId.sql
View File

@@ -5,17 +5,13 @@ BEGIN
SET NOCOUNT ON
SELECT
c.*,
*,
1 [Edit],
1 [ViewPassword],
1 [Manage],
0 [OrganizationUseTotp],
ca.ArchivedDate
0 [OrganizationUseTotp]
FROM
[dbo].[CipherDetails](@UserId) AS c
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = c.Id
AND ca.UserId = @UserId
[dbo].[CipherDetails](@UserId)
WHERE
c.[UserId] = @UserId
[UserId] = @UserId
END

118
util/Migrator/DbScripts/2025-11-14_00_AddArchiveCipherToCipherDetails.sql
View File

@@ -1,56 +1,3 @@
IF OBJECT_ID('[dbo].[CipherDetails_ReadByUserId]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[CipherDetails_ReadByUserId];
END
GO
CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON;
SELECT
c.*,
ca.ArchivedDate
FROM
[dbo].[UserCipherDetails](@UserId) AS c
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = c.Id
AND ca.UserId = @UserId;
END
GO
IF OBJECT_ID('[dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId];
END
GO
CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
c.*,
1 [Edit],
1 [ViewPassword],
1 [Manage],
0 [OrganizationUseTotp],
ca.ArchivedDate
FROM
[dbo].[CipherDetails](@UserId) AS c
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = c.Id
AND ca.UserId = @UserId
WHERE
c.[UserId] = @UserId
END
GO
IF OBJECT_ID('[dbo].[Cipher_Archive]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[Cipher_Archive];
@@ -206,9 +153,14 @@ SELECT
END [FolderId],
C.[DeletedDate],
C.[Reprompt],
C.[Key]
C.[Key],
CA.[ArchivedDate]
FROM
[dbo].[Cipher] C
LEFT JOIN [dbo].[CipherArchive] CA
ON CA.[CipherId] = C.[Id]
AND CA.[UserId] = @UserId;
GO
IF OBJECT_ID('[dbo].[UserCipherDetails]') IS NOT NULL
@@ -242,6 +194,7 @@ SELECT
C.Favorite,
C.FolderId,
C.DeletedDate,
C.ArchivedDate,
C.Reprompt,
C.[Key],
CASE
@@ -298,6 +251,7 @@ SELECT
C.Favorite,
C.FolderId,
C.DeletedDate,
C.ArchivedDate,
C.Reprompt,
C.[Key],
1 [Edit],
@@ -308,61 +262,5 @@ FROM
[dbo].[CipherDetails](@UserId) AS C
WHERE
C.[UserId] = @UserId;
GO
IF OBJECT_ID('[dbo].[CipherDetails_ReadByIdUserId]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[CipherDetails_ReadByIdUserId];
END
GO
CREATE PROCEDURE [dbo].[CipherDetails_ReadByIdUserId]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON;
SELECT
ucd.Id,
ucd.UserId,
ucd.OrganizationId,
ucd.Type,
ucd.Data,
ucd.Attachments,
ucd.CreationDate,
ucd.RevisionDate,
ucd.Favorite,
ucd.FolderId,
ucd.DeletedDate,
ucd.Reprompt,
ucd.[Key],
ucd.OrganizationUseTotp,
MAX(ca.ArchivedDate) AS ArchivedDate,
MAX(ucd.Edit) AS Edit,
MAX(ucd.ViewPassword) AS ViewPassword,
MAX(ucd.Manage) AS Manage
FROM
[dbo].[UserCipherDetails](@UserId) AS ucd
LEFT JOIN [dbo].[CipherArchive] AS ca
ON ca.CipherId = ucd.Id
AND ca.UserId = @UserId
WHERE
ucd.Id = @Id
GROUP BY
ucd.Id,
ucd.UserId,
ucd.OrganizationId,
ucd.Type,
ucd.Data,
ucd.Attachments,
ucd.CreationDate,
ucd.RevisionDate,
ucd.Favorite,
ucd.FolderId,
ucd.DeletedDate,
ucd.Reprompt,
ucd.[Key],
ucd.OrganizationUseTotp;
END
GO