1
0
mirror of https://github.com/bitwarden/server synced 2025-12-20 18:23:44 +00:00

fix sql syntax

This commit is contained in:
jaasen-livefront
2025-12-03 11:10:43 -08:00
parent 743afe0248
commit 81c70c0335
5 changed files with 61 additions and 5 deletions

View File

@@ -36,4 +36,4 @@ SELECT
ELSE TRY_CONVERT(DATETIME2(7), JSON_VALUE(C.[Archives], CONCAT('$."', @UserId, '"'))) ELSE TRY_CONVERT(DATETIME2(7), JSON_VALUE(C.[Archives], CONCAT('$."', @UserId, '"')))
END [ArchivedDate] END [ArchivedDate]
FROM FROM
[dbo].[Cipher] C; [dbo].[Cipher] C;

View File

@@ -90,4 +90,4 @@ SELECT
FROM FROM
[dbo].[CipherDetails](@UserId) AS C [dbo].[CipherDetails](@UserId) AS C
WHERE WHERE
C.[UserId] = @UserId; C.[UserId] = @UserId;

View File

@@ -14,7 +14,7 @@
@Key VARCHAR(MAX) = NULL, @Key VARCHAR(MAX) = NULL,
@CollectionIds AS [dbo].[GuidIdArray] READONLY, @CollectionIds AS [dbo].[GuidIdArray] READONLY,
@ArchivedDate DATETIME2(7) = NULL, @ArchivedDate DATETIME2(7) = NULL,
@Archives NVARCHAR(MAX) = NULL @Archives NVARCHAR(MAX)
AS AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON

View File

@@ -13,7 +13,7 @@
@Reprompt TINYINT, @Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL, @Key VARCHAR(MAX) = NULL,
@ArchivedDate DATETIME2(7) = NULL, @ArchivedDate DATETIME2(7) = NULL,
@Archives NVARCHAR(MAX) = NULL @Archives NVARCHAR(MAX)
AS AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON

View File

@@ -195,7 +195,7 @@ BEGIN
UPDATE UPDATE
[dbo].[Cipher] [dbo].[Cipher]
SET SET
[ArchivedDate] = JSON_MODIFY( [Archives] = JSON_MODIFY(
COALESCE([Archives], N'{}'), COALESCE([Archives], N'{}'),
'$."' + CONVERT(NVARCHAR(36), @UserId) + '"', '$."' + CONVERT(NVARCHAR(36), @UserId) + '"',
@UtcNow @UtcNow
@@ -375,3 +375,59 @@ BEGIN
END END
END END
GO GO
IF OBJECT_ID('[dbo].[Cipher_Update]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[Cipher_Update];
END
GO
CREATE PROCEDURE [dbo].[Cipher_Update]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER,
@OrganizationId UNIQUEIDENTIFIER,
@Type TINYINT,
@Data NVARCHAR(MAX),
@Favorites NVARCHAR(MAX),
@Folders NVARCHAR(MAX),
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL,
@ArchivedDate DATETIME2(7) = NULL,
@Archives NVARCHAR(MAX)
AS
BEGIN
SET NOCOUNT ON
UPDATE
[dbo].[Cipher]
SET
[UserId] = CASE WHEN @OrganizationId IS NULL THEN @UserId ELSE NULL END,
[OrganizationId] = @OrganizationId,
[Type] = @Type,
[Data] = @Data,
[Favorites] = @Favorites,
[Folders] = @Folders,
[Attachments] = @Attachments,
[CreationDate] = @CreationDate,
[RevisionDate] = @RevisionDate,
[DeletedDate] = @DeletedDate,
[Reprompt] = @Reprompt,
[Key] = @Key,
[ArchivedDate] = @ArchivedDate,
[Archives] = @Archives
WHERE
[Id] = @Id
IF @OrganizationId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
END
ELSE IF @UserId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
END