nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 02:52:50 -05:00
Code Activity

[PM-10349] Drop Organization.FlexibleCollections column (#4583)

Browse Source
This commit is contained in:
Thomas Rittson
2024-08-12 08:28:13 +10:00
committed by GitHub
parent de1a816b07
commit 916be50e66
7 changed files with 491 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Sql/dbo/Stored Procedures/Organization_Create.sql
View File

@ -52,8 +52,7 @@
@MaxAutoscaleSmServiceAccounts INT = null,
@SecretsManagerBeta BIT = 0,
@LimitCollectionCreationDeletion BIT = 1,
@AllowAdminAccessToAllCollectionItems BIT = 1,
@FlexibleCollections BIT = 0
@AllowAdminAccessToAllCollectionItems BIT = 1
AS
BEGIN
SET NOCOUNT ON
@ -113,8 +112,7 @@ BEGIN
[MaxAutoscaleSmServiceAccounts],
[SecretsManagerBeta],
[LimitCollectionCreationDeletion],
[AllowAdminAccessToAllCollectionItems],
[FlexibleCollections]
[AllowAdminAccessToAllCollectionItems]
)
VALUES
(
@ -171,7 +169,6 @@ BEGIN
@MaxAutoscaleSmServiceAccounts,
@SecretsManagerBeta,
@LimitCollectionCreationDeletion,
@AllowAdminAccessToAllCollectionItems,
@FlexibleCollections
@AllowAdminAccessToAllCollectionItems
)
END

3
src/Sql/dbo/Stored Procedures/Organization_ReadAbilities.sql
View File

@ -22,8 +22,7 @@ BEGIN
[UsePolicies],
[Enabled],
[LimitCollectionCreationDeletion],
[AllowAdminAccessToAllCollectionItems],
[FlexibleCollections]
[AllowAdminAccessToAllCollectionItems]
FROM
[dbo].[Organization]
END

6
src/Sql/dbo/Stored Procedures/Organization_Update.sql
View File

@ -52,8 +52,7 @@
@MaxAutoscaleSmServiceAccounts INT = null,
@SecretsManagerBeta BIT = 0,
@LimitCollectionCreationDeletion BIT = 1,
@AllowAdminAccessToAllCollectionItems BIT = 1,
@FlexibleCollections BIT = 0
@AllowAdminAccessToAllCollectionItems BIT = 1
AS
BEGIN
SET NOCOUNT ON
@ -113,8 +112,7 @@ BEGIN
[MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
[SecretsManagerBeta] = @SecretsManagerBeta,
[LimitCollectionCreationDeletion] = @LimitCollectionCreationDeletion,
[AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems,
[FlexibleCollections] = @FlexibleCollections
[AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems
WHERE
[Id] = @Id
END

1
src/Sql/dbo/Tables/Organization.sql
View File

@ -53,7 +53,6 @@
[SecretsManagerBeta] BIT NOT NULL CONSTRAINT [DF_Organization_SecretsManagerBeta] DEFAULT (0),
[LimitCollectionCreationDeletion] BIT NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCreationDeletion] DEFAULT (1),
[AllowAdminAccessToAllCollectionItems] BIT NOT NULL CONSTRAINT [DF_Organization_AllowAdminAccessToAllCollectionItems] DEFAULT (1),
[FlexibleCollections] BIT NOT NULL CONSTRAINT [DF_Organization_FlexibleCollections] DEFAULT (0)
CONSTRAINT [PK_Organization] PRIMARY KEY CLUSTERED ([Id] ASC)
);

3
src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
View File

@ -47,8 +47,7 @@ SELECT
O.[SmSeats],
O.[SmServiceAccounts],
O.[LimitCollectionCreationDeletion],
O.[AllowAdminAccessToAllCollectionItems],
O.[FlexibleCollections]
O.[AllowAdminAccessToAllCollectionItems]
FROM
[dbo].[OrganizationUser] OU
LEFT JOIN

3
src/Sql/dbo/Views/ProviderUserProviderOrganizationDetailsView.sql
View File

@ -33,8 +33,7 @@ SELECT
P.[Name] ProviderName,
O.[PlanType],
O.[LimitCollectionCreationDeletion],
O.[AllowAdminAccessToAllCollectionItems],
O.[FlexibleCollections]
O.[AllowAdminAccessToAllCollectionItems]
FROM
[dbo].[ProviderUser] PU
INNER JOIN