From 5b614f8968368a85ddf0648644b3aa73e20a1929 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Wed, 9 Apr 2025 15:01:59 +0200
Subject: [PATCH] Fix stored procedures & type

---
 .../OrganizationSponsorship_Create.sql               |  4 ++--
 .../OrganizationSponsorship_Update.sql               |  4 ++--
 .../dbo/Stored Procedures/Organization_Create.sql    | 12 ++++++------
 .../dbo/Stored Procedures/Organization_Update.sql    |  7 ++++---
 .../OrganizationSponsorshipType.sql                  |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Create.sql b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Create.sql
index e79d8770b3..95dd2a6014 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Create.sql	
@@ -9,8 +9,8 @@ CREATE PROCEDURE [dbo].[OrganizationSponsorship_Create]
     @ToDelete BIT,
     @LastSyncDate DATETIME2 (7),
     @ValidUntil DATETIME2 (7),
-    @IsAdminInitiated BIT,
-    @Notes NVARCHAR(512)
+    @IsAdminInitiated BIT = 0,
+    @Notes NVARCHAR(512) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Update.sql b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Update.sql
index d1c68319f4..25d6c26c12 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_Update.sql	
@@ -9,8 +9,8 @@ CREATE PROCEDURE [dbo].[OrganizationSponsorship_Update]
     @ToDelete BIT,
     @LastSyncDate DATETIME2 (7),
     @ValidUntil DATETIME2 (7),
-    @IsAdminInitiated BIT,
-    @Notes NVARCHAR(512)
+    @IsAdminInitiated BIT = 0,
+    @Notes NVARCHAR(512) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/Organization_Create.sql b/src/Sql/dbo/Stored Procedures/Organization_Create.sql
index dc2a8f6e8f..ef434f1078 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_Create.sql	
@@ -55,8 +55,8 @@ CREATE PROCEDURE [dbo].[Organization_Create]
     @LimitCollectionDeletion BIT = NULL,
     @AllowAdminAccessToAllCollectionItems BIT = 0,
     @UseRiskInsights BIT = 0,
-    @UseAdminSponsoredFamilies BIT = 0,
-    @LimitItemDeletion BIT = 0
+    @LimitItemDeletion BIT = 0,
+    @UseAdminSponsoredFamilies BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -119,8 +119,8 @@ BEGIN
         [LimitCollectionDeletion],
         [AllowAdminAccessToAllCollectionItems],
         [UseRiskInsights],
-        [UseAdminSponsoredFamilies],
-        [LimitItemDeletion]
+        [LimitItemDeletion],
+        [UseAdminSponsoredFamilies]
     )
     VALUES
     (
@@ -180,7 +180,7 @@ BEGIN
         @LimitCollectionDeletion,
         @AllowAdminAccessToAllCollectionItems,
         @UseRiskInsights,
-        @UseAdminSponsoredFamilies,
-        @LimitItemDeletion
+        @LimitItemDeletion,
+        @UseAdminSponsoredFamilies
     )
 END
diff --git a/src/Sql/dbo/Stored Procedures/Organization_Update.sql b/src/Sql/dbo/Stored Procedures/Organization_Update.sql
index e76c7d6005..537433ad51 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
@@ -55,8 +55,8 @@ CREATE PROCEDURE [dbo].[Organization_Update]
     @LimitCollectionDeletion BIT = null,
     @AllowAdminAccessToAllCollectionItems BIT = 0,
     @UseRiskInsights BIT = 0,
-    @UseAdminSponsoredFamilies BIT = 0,
-    @LimitItemDeletion BIT = 0
+    @LimitItemDeletion BIT = 0,
+    @UseAdminSponsoredFamilies BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -119,7 +119,8 @@ BEGIN
         [LimitCollectionDeletion] = @LimitCollectionDeletion,
         [AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems,
         [UseRiskInsights] = @UseRiskInsights,
-        [LimitItemDeletion] = @LimitItemDeletion
+        [LimitItemDeletion] = @LimitItemDeletion,
+        [UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies
     WHERE
         [Id] = @Id
 END
diff --git a/src/Sql/dbo/User Defined Types/OrganizationSponsorshipType.sql b/src/Sql/dbo/User Defined Types/OrganizationSponsorshipType.sql
index 0df4eadbb8..19fbb5e50f 100644
--- a/src/Sql/dbo/User Defined Types/OrganizationSponsorshipType.sql	
+++ b/src/Sql/dbo/User Defined Types/OrganizationSponsorshipType.sql	
@@ -9,6 +9,6 @@ CREATE TYPE [dbo].[OrganizationSponsorshipType] AS TABLE(
     [LastSyncDate] DATETIME2(7),
     [ValidUntil] DATETIME2(7),
     [ToDelete] BIT,
-    [IsAdminInitiated] BIT,
-    [Notes] NVARCHAR(512)
+    [IsAdminInitiated] BIT DEFAULT 0,
+    [Notes] NVARCHAR(512) NULL
 )