From 744d21ec5e4744b91b23dc2768dbeb993dd1c96a Mon Sep 17 00:00:00 2001
From: rkac-bw <148072202+rkac-bw@users.noreply.github.com>
Date: Wed, 14 Feb 2024 09:48:58 -0700
Subject: [PATCH] [PM-4767] Update Grant_Save procedure (#3641)

* modify grant_save sql script to migration and Auth SQL scripts to not use merge

* Update formatting for sql files

* Fix formatting for sql files

* Format using Prettier

* Rename 2024-01-03_00_FixGrantSave.sql to 2024-02-12_00_FixGrantSave.sql

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
---
 .../Auth/dbo/Stored Procedures/Grant_Save.sql | 99 +++++++------------
 .../DbScripts/2024-02-12_00_FixGrantSave.sql  | 61 ++++++++++++
 2 files changed, 97 insertions(+), 63 deletions(-)
 create mode 100644 util/Migrator/DbScripts/2024-02-12_00_FixGrantSave.sql

diff --git a/src/Sql/Auth/dbo/Stored Procedures/Grant_Save.sql b/src/Sql/Auth/dbo/Stored Procedures/Grant_Save.sql
index bac37f1400..3067f3712f 100644
--- a/src/Sql/Auth/dbo/Stored Procedures/Grant_Save.sql	
+++ b/src/Sql/Auth/dbo/Stored Procedures/Grant_Save.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[Grant_Save]
-    @Key  NVARCHAR(200),
-    @Type  NVARCHAR(50),
+    @Key NVARCHAR(200),
+    @Type NVARCHAR(50),
     @SubjectId NVARCHAR(200),
     @SessionId NVARCHAR(100),
     @ClientId NVARCHAR(200),
@@ -13,53 +13,26 @@ AS
 BEGIN
     SET NOCOUNT ON
 
-    MERGE
-        [dbo].[Grant] AS [Target]
-    USING
-    ( 
-        VALUES
-        (
-            @Key,
-            @Type,
-            @SubjectId,
-            @SessionId,
-            @ClientId,
-            @Description,
-            @CreationDate,
-            @ExpirationDate,
-            @ConsumedDate,
-            @Data
-        )
-    ) AS [Source]
-    (
-        [Key],
-        [Type],
-        [SubjectId],
-        [SessionId],
-        [ClientId],
-        [Description],
-        [CreationDate],
-        [ExpirationDate],
-        [ConsumedDate],
-        [Data]
-    ) 
-    ON
-        [Target].[Key] = [Source].[Key]
-    WHEN MATCHED THEN
-        UPDATE
-        SET
-            [Type] = [Source].[Type],
-            [SubjectId] = [Source].[SubjectId],
-            [SessionId] = [Source].[SessionId],
-            [ClientId] = [Source].[ClientId],
-            [Description] = [Source].[Description],
-            [CreationDate] = [Source].[CreationDate],
-            [ExpirationDate] = [Source].[ExpirationDate],
-            [ConsumedDate] = [Source].[ConsumedDate],
-            [Data] = [Source].[Data]
-    WHEN NOT MATCHED THEN
-        INSERT
-        (
+    -- First, try to update the existing row
+    UPDATE [dbo].[Grant]
+    SET
+        [Type] = @Type,
+        [SubjectId] = @SubjectId,
+        [SessionId] = @SessionId,
+        [ClientId] = @ClientId,
+        [Description] = @Description,
+        [CreationDate] = @CreationDate,
+        [ExpirationDate] = @ExpirationDate,
+        [ConsumedDate] = @ConsumedDate,
+        [Data] = @Data
+    WHERE
+        [Key] = @Key
+
+    -- If no row was updated, insert a new one
+    IF @@ROWCOUNT = 0
+    BEGIN
+        INSERT INTO [dbo].[Grant]
+            (
             [Key],
             [Type],
             [SubjectId],
@@ -70,19 +43,19 @@ BEGIN
             [ExpirationDate],
             [ConsumedDate],
             [Data]
-        )
+            )
         VALUES
-        (
-            [Source].[Key],
-            [Source].[Type],
-            [Source].[SubjectId],
-            [Source].[SessionId],
-            [Source].[ClientId],
-            [Source].[Description],
-            [Source].[CreationDate],
-            [Source].[ExpirationDate],
-            [Source].[ConsumedDate],
-            [Source].[Data]
-        )
-    ;
+            (
+                @Key,
+                @Type,
+                @SubjectId,
+                @SessionId,
+                @ClientId,
+                @Description,
+                @CreationDate,
+                @ExpirationDate,
+                @ConsumedDate,
+                @Data
+            )
+    END
 END
diff --git a/util/Migrator/DbScripts/2024-02-12_00_FixGrantSave.sql b/util/Migrator/DbScripts/2024-02-12_00_FixGrantSave.sql
new file mode 100644
index 0000000000..33325b192b
--- /dev/null
+++ b/util/Migrator/DbScripts/2024-02-12_00_FixGrantSave.sql
@@ -0,0 +1,61 @@
+CREATE OR ALTER PROCEDURE [dbo].[Grant_Save]
+    @Key NVARCHAR(200),
+    @Type NVARCHAR(50),
+    @SubjectId NVARCHAR(200),
+    @SessionId NVARCHAR(100),
+    @ClientId NVARCHAR(200),
+    @Description NVARCHAR(200),
+    @CreationDate DATETIME2,
+    @ExpirationDate DATETIME2,
+    @ConsumedDate DATETIME2,
+    @Data NVARCHAR(MAX)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    -- First, try to update the existing row
+    UPDATE [dbo].[Grant]
+    SET
+        [Type] = @Type,
+        [SubjectId] = @SubjectId,
+        [SessionId] = @SessionId,
+        [ClientId] = @ClientId,
+        [Description] = @Description,
+        [CreationDate] = @CreationDate,
+        [ExpirationDate] = @ExpirationDate,
+        [ConsumedDate] = @ConsumedDate,
+        [Data] = @Data
+    WHERE
+        [Key] = @Key
+
+    -- If no row was updated, insert a new one
+    IF @@ROWCOUNT = 0
+    BEGIN
+        INSERT INTO [dbo].[Grant]
+            (
+            [Key],
+            [Type],
+            [SubjectId],
+            [SessionId],
+            [ClientId],
+            [Description],
+            [CreationDate],
+            [ExpirationDate],
+            [ConsumedDate],
+            [Data]
+            )
+        VALUES
+            (
+                @Key,
+                @Type,
+                @SubjectId,
+                @SessionId,
+                @ClientId,
+                @Description,
+                @CreationDate,
+                @ExpirationDate,
+                @ConsumedDate,
+                @Data
+            )
+    END
+END