From 3ffc00de43ca627b21c193ed2880772101b22578 Mon Sep 17 00:00:00 2001
From: Cy Okeke <cokeke@bitwarden.com>
Date: Thu, 3 Apr 2025 13:54:52 +0100
Subject: [PATCH] Resolve the existing conflict and remove added file

---
 .../Stored Procedures/Organization_Update.sql |   1 +
 ...-02_00_UpdateUseAdminSponsoredFamilies.sql | 131 ------------------
 2 files changed, 1 insertion(+), 131 deletions(-)
 delete mode 100644 util/Migrator/DbScripts/2025-04-02_00_UpdateUseAdminSponsoredFamilies.sql

diff --git a/src/Sql/dbo/Stored Procedures/Organization_Update.sql b/src/Sql/dbo/Stored Procedures/Organization_Update.sql
index e76c7d6005..f575ba4755 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
@@ -119,6 +119,7 @@ BEGIN
         [LimitCollectionDeletion] = @LimitCollectionDeletion,
         [AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems,
         [UseRiskInsights] = @UseRiskInsights,
+        [UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies,
         [LimitItemDeletion] = @LimitItemDeletion
     WHERE
         [Id] = @Id
diff --git a/util/Migrator/DbScripts/2025-04-02_00_UpdateUseAdminSponsoredFamilies.sql b/util/Migrator/DbScripts/2025-04-02_00_UpdateUseAdminSponsoredFamilies.sql
deleted file mode 100644
index dfa73160ee..0000000000
--- a/util/Migrator/DbScripts/2025-04-02_00_UpdateUseAdminSponsoredFamilies.sql
+++ /dev/null
@@ -1,131 +0,0 @@
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-ALTER   PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Identifier NVARCHAR(50),
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(256),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats INT,
-    @MaxCollections SMALLINT,
-    @UsePolicies BIT,
-    @UseSso BIT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @Use2fa BIT,
-    @UseApi BIT,
-    @UseResetPassword BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @ReferenceData VARCHAR(MAX),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @PublicKey VARCHAR(MAX),
-    @PrivateKey VARCHAR(MAX),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @OwnersNotifiedOfAutoscaling DATETIME2(7),
-    @MaxAutoscaleSeats INT,
-    @UseKeyConnector BIT = 0,
-    @UseScim BIT = 0,
-    @UseCustomPermissions BIT = 0,
-    @UseSecretsManager BIT = 0,
-    @Status TINYINT = 0,
-    @UsePasswordManager BIT = 1,
-    @SmSeats INT = null,
-    @SmServiceAccounts INT = null,
-    @MaxAutoscaleSmSeats INT = null,
-    @MaxAutoscaleSmServiceAccounts INT = null,
-    @SecretsManagerBeta BIT = 0,
-    @LimitCollectionCreation BIT = null,
-    @LimitCollectionDeletion BIT = null,
-    @AllowAdminAccessToAllCollectionItems BIT = 0,
-    @UseRiskInsights BIT = 0,
-    @UseAdminSponsoredFamilies BIT = 0,
-    @LimitItemDeletion BIT = 0
-AS
-BEGIN
-    SET NOCOUNT ON
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [Identifier] = @Identifier,
-    [Name] = @Name,
-    [BusinessName] = @BusinessName,
-    [BusinessAddress1] = @BusinessAddress1,
-    [BusinessAddress2] = @BusinessAddress2,
-    [BusinessAddress3] = @BusinessAddress3,
-    [BusinessCountry] = @BusinessCountry,
-    [BusinessTaxNumber] = @BusinessTaxNumber,
-    [BillingEmail] = @BillingEmail,
-    [Plan] = @Plan,
-    [PlanType] = @PlanType,
-    [Seats] = @Seats,
-    [MaxCollections] = @MaxCollections,
-    [UsePolicies] = @UsePolicies,
-    [UseSso] = @UseSso,
-    [UseGroups] = @UseGroups,
-    [UseDirectory] = @UseDirectory,
-    [UseEvents] = @UseEvents,
-    [UseTotp] = @UseTotp,
-    [Use2fa] = @Use2fa,
-    [UseApi] = @UseApi,
-    [UseResetPassword] = @UseResetPassword,
-    [SelfHost] = @SelfHost,
-    [UsersGetPremium] = @UsersGetPremium,
-    [Storage] = @Storage,
-    [MaxStorageGb] = @MaxStorageGb,
-    [Gateway] = @Gateway,
-    [GatewayCustomerId] = @GatewayCustomerId,
-    [GatewaySubscriptionId] = @GatewaySubscriptionId,
-    [ReferenceData] = @ReferenceData,
-    [Enabled] = @Enabled,
-    [LicenseKey] = @LicenseKey,
-    [PublicKey] = @PublicKey,
-    [PrivateKey] = @PrivateKey,
-    [TwoFactorProviders] = @TwoFactorProviders,
-    [ExpirationDate] = @ExpirationDate,
-    [CreationDate] = @CreationDate,
-    [RevisionDate] = @RevisionDate,
-    [OwnersNotifiedOfAutoscaling] = @OwnersNotifiedOfAutoscaling,
-    [MaxAutoscaleSeats] = @MaxAutoscaleSeats,
-    [UseKeyConnector] = @UseKeyConnector,
-    [UseScim] = @UseScim,
-    [UseCustomPermissions] = @UseCustomPermissions,
-    [UseSecretsManager] = @UseSecretsManager,
-    [Status] = @Status,
-    [UsePasswordManager] = @UsePasswordManager,
-    [SmSeats] = @SmSeats,
-    [SmServiceAccounts] = @SmServiceAccounts,
-    [MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats,
-    [MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
-    [SecretsManagerBeta] = @SecretsManagerBeta,
-    [LimitCollectionCreation] = @LimitCollectionCreation,
-    [LimitCollectionDeletion] = @LimitCollectionDeletion,
-    [AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems,
-    [UseRiskInsights] = @UseRiskInsights,
-    [UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies,
-    [LimitItemDeletion] = @LimitItemDeletion
-WHERE
-    [Id] = @Id
-END
-GO