mirror of
https://github.com/bitwarden/server
synced 2025-12-23 19:53:40 +00:00
db merge fixes
This commit is contained in:
@@ -74,6 +74,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
|
||||
@UseOrganizationDomains BIT = 0,
|
||||
@UseAdminSponsoredFamilies BIT = 0,
|
||||
@SyncSeats BIT = 0,
|
||||
@UseAutomaticUserConfirmation BIT = 0,
|
||||
@UseDisableSMAdsForUsers BIT = 0
|
||||
AS
|
||||
BEGIN
|
||||
@@ -141,6 +142,7 @@ BEGIN
|
||||
[UseOrganizationDomains],
|
||||
[UseAdminSponsoredFamilies],
|
||||
[SyncSeats],
|
||||
[UseAutomaticUserConfirmation],
|
||||
[UseDisableSMAdsForUsers]
|
||||
)
|
||||
VALUES
|
||||
@@ -205,6 +207,7 @@ BEGIN
|
||||
@UseOrganizationDomains,
|
||||
@UseAdminSponsoredFamilies,
|
||||
@SyncSeats,
|
||||
@UseAutomaticUserConfirmation,
|
||||
@UseDisableSMAdsForUsers
|
||||
)
|
||||
END
|
||||
@@ -271,6 +274,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
|
||||
@UseOrganizationDomains BIT = 0,
|
||||
@UseAdminSponsoredFamilies BIT = 0,
|
||||
@SyncSeats BIT = 0,
|
||||
@UseAutomaticUserConfirmation BIT = 0,
|
||||
@UseDisableSMAdsForUsers BIT = 0
|
||||
AS
|
||||
BEGIN
|
||||
@@ -338,6 +342,7 @@ BEGIN
|
||||
[UseOrganizationDomains] = @UseOrganizationDomains,
|
||||
[UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies,
|
||||
[SyncSeats] = @SyncSeats,
|
||||
[UseAutomaticUserConfirmation] = @UseAutomaticUserConfirmation,
|
||||
[UseDisableSMAdsForUsers] = @UseDisableSMAdsForUsers
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
|
||||
Reference in New Issue
Block a user