1
0
mirror of https://github.com/bitwarden/server synced 2025-12-23 19:53:40 +00:00

db merge fixes

This commit is contained in:
cd-bitwarden
2025-10-22 18:14:13 -04:00
parent 3d51aac843
commit f319d7a147

View File

@@ -74,6 +74,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
@UseOrganizationDomains BIT = 0, @UseOrganizationDomains BIT = 0,
@UseAdminSponsoredFamilies BIT = 0, @UseAdminSponsoredFamilies BIT = 0,
@SyncSeats BIT = 0, @SyncSeats BIT = 0,
@UseAutomaticUserConfirmation BIT = 0,
@UseDisableSMAdsForUsers BIT = 0 @UseDisableSMAdsForUsers BIT = 0
AS AS
BEGIN BEGIN
@@ -141,6 +142,7 @@ BEGIN
[UseOrganizationDomains], [UseOrganizationDomains],
[UseAdminSponsoredFamilies], [UseAdminSponsoredFamilies],
[SyncSeats], [SyncSeats],
[UseAutomaticUserConfirmation],
[UseDisableSMAdsForUsers] [UseDisableSMAdsForUsers]
) )
VALUES VALUES
@@ -205,6 +207,7 @@ BEGIN
@UseOrganizationDomains, @UseOrganizationDomains,
@UseAdminSponsoredFamilies, @UseAdminSponsoredFamilies,
@SyncSeats, @SyncSeats,
@UseAutomaticUserConfirmation,
@UseDisableSMAdsForUsers @UseDisableSMAdsForUsers
) )
END END
@@ -271,6 +274,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
@UseOrganizationDomains BIT = 0, @UseOrganizationDomains BIT = 0,
@UseAdminSponsoredFamilies BIT = 0, @UseAdminSponsoredFamilies BIT = 0,
@SyncSeats BIT = 0, @SyncSeats BIT = 0,
@UseAutomaticUserConfirmation BIT = 0,
@UseDisableSMAdsForUsers BIT = 0 @UseDisableSMAdsForUsers BIT = 0
AS AS
BEGIN BEGIN
@@ -338,6 +342,7 @@ BEGIN
[UseOrganizationDomains] = @UseOrganizationDomains, [UseOrganizationDomains] = @UseOrganizationDomains,
[UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies, [UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies,
[SyncSeats] = @SyncSeats, [SyncSeats] = @SyncSeats,
[UseAutomaticUserConfirmation] = @UseAutomaticUserConfirmation,
[UseDisableSMAdsForUsers] = @UseDisableSMAdsForUsers [UseDisableSMAdsForUsers] = @UseDisableSMAdsForUsers
WHERE WHERE
[Id] = @Id [Id] = @Id