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

[AC-1646] Rename LimitCollectionCdOwnerAdmin column (#3300)

Browse Source 
* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion

* Rename and bump migration script
This commit is contained in:
Thomas Rittson
2023-09-27 07:37:34 +10:00
committed by GitHub
parent 5d431adbd4
commit a3f554a34e
25 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
util/Migrator/DbScripts/2023-07-31_00_LimitCollectionCreateDelete.sql → util/Migrator/DbScripts/2023-09-26_00_LimitCollectionCreationDeletion.sql
View File

@ -1,10 +1,10 @@
--Add column 'LimitCollectionCdOwnerAdmin' to 'Organization' table
IF COL_LENGTH('[dbo].[Organization]', 'LimitCollectionCdOwnerAdmin') IS NULL
--Add column 'LimitCollectionCreationDeletion' to 'Organization' table
IF COL_LENGTH('[dbo].[Organization]', 'LimitCollectionCreationDeletion') IS NULL
BEGIN
ALTER TABLE
[dbo].[Organization]
ADD
[LimitCollectionCdOwnerAdmin] BIT NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCdOwnerAdmin] DEFAULT (1)
[LimitCollectionCreationDeletion] BIT NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCreationDeletion] DEFAULT (1)
END
GO
@ -12,8 +12,8 @@ GO
/**
ORGANIZATION STORED PROCEDURES
*/
--Alter `Organization_Create` sproc to include `LimitCollectionCdOwnerAdmin` column and default value
--Alter `Organization_Create` sproc to include `LimitCollectionCreationDeletion` column and default value
CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
@Id UNIQUEIDENTIFIER OUTPUT,
@Identifier NVARCHAR(50),
@ -67,7 +67,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
@MaxAutoscaleSmSeats INT= null,
@MaxAutoscaleSmServiceAccounts INT = null,
@SecretsManagerBeta BIT = 0,
@LimitCollectionCdOwnerAdmin BIT = 0
@LimitCollectionCreationDeletion BIT = 0
AS
BEGIN
SET NOCOUNT ON
@ -126,7 +126,7 @@ BEGIN
[MaxAutoscaleSmSeats],
[MaxAutoscaleSmServiceAccounts],
[SecretsManagerBeta],
[LimitCollectionCdOwnerAdmin]
[LimitCollectionCreationDeletion]
)
VALUES
(
@ -182,12 +182,12 @@ BEGIN
@MaxAutoscaleSmSeats,
@MaxAutoscaleSmServiceAccounts,
@SecretsManagerBeta,
@LimitCollectionCdOwnerAdmin
@LimitCollectionCreationDeletion
)
END
GO
--Alter `Organization_Update` sproc to include `LimitCollectionCdOwnerAdmin` column
--Alter `Organization_Update` sproc to include `LimitCollectionCreationDeletion` column
CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
@Id UNIQUEIDENTIFIER,
@Identifier NVARCHAR(50),
@ -241,7 +241,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
@MaxAutoscaleSmSeats INT = null,
@MaxAutoscaleSmServiceAccounts INT = null,
@SecretsManagerBeta BIT = 0,
@LimitCollectionCdOwnerAdmin BIT = 1
@LimitCollectionCreationDeletion BIT = 1
AS
BEGIN
SET NOCOUNT ON
@ -300,7 +300,7 @@ BEGIN
[MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats,
[MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
[SecretsManagerBeta] = @SecretsManagerBeta,
[LimitCollectionCdOwnerAdmin] = @LimitCollectionCdOwnerAdmin
[LimitCollectionCreationDeletion] = @LimitCollectionCreationDeletion
WHERE
[Id] = @Id
END
@ -310,8 +310,8 @@ GO
/**
ORGANIZATION VIEWS
*/
--Add 'LimitCollectionCdOwnerAdmin` to OrganizationUserOrganizationDetailsView
--Add 'LimitCollectionCreationDeletion` to OrganizationUserOrganizationDetailsView
CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
AS
SELECT
@ -359,7 +359,7 @@ SELECT
O.[UsePasswordManager],
O.[SmSeats],
O.[SmServiceAccounts],
O.[LimitCollectionCdOwnerAdmin]
O.[LimitCollectionCreationDeletion]
FROM
[dbo].[OrganizationUser] OU
LEFT JOIN
@ -386,7 +386,7 @@ GO
/**
PROVIDER VIEWS - not directly modified, but access Organization table
*/
--Manually refresh ProviderOrganizationOrganizationDetailsView
IF OBJECT_ID('[dbo].[ProviderOrganizationOrganizationDetailsView]') IS NOT NULL
BEGIN
@ -399,4 +399,4 @@ IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL
BEGIN
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetailsView]';
END
GO
GO

2
util/MySqlMigrations/Migrations/20230807181649_LimitCollectionCreateDelete.Designer.cs generated
View File

@ -567,7 +567,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("varchar(100)");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("tinyint(1)")
.HasDefaultValue(true);

4
util/MySqlMigrations/Migrations/20230807181649_LimitCollectionCreateDelete.cs
View File

@ -11,7 +11,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization",
type: "tinyint(1)",
nullable: false,
@ -22,7 +22,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization");
}
}

2
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -570,7 +570,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("varchar(100)");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("tinyint(1)")
.HasDefaultValue(true);

2
util/PostgresMigrations/Migrations/20230807181653_LimitCollectionCreateDelete.Designer.cs generated
View File

@ -577,7 +577,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("boolean")
.HasDefaultValue(true);

4
util/PostgresMigrations/Migrations/20230807181653_LimitCollectionCreateDelete.cs
View File

@ -11,7 +11,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization",
type: "boolean",
nullable: false,
@ -22,7 +22,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization");
}
}

2
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -580,7 +580,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("boolean")
.HasDefaultValue(true);

2
util/SqliteMigrations/Migrations/20230807181657_LimitCollectionCreateDelete.Designer.cs generated
View File

@ -565,7 +565,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("TEXT");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("INTEGER")
.HasDefaultValue(true);

4
util/SqliteMigrations/Migrations/20230807181657_LimitCollectionCreateDelete.cs
View File

@ -11,7 +11,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization",
type: "INTEGER",
nullable: false,
@ -22,7 +22,7 @@ public partial class LimitCollectionCreateDelete : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "LimitCollectionCdOwnerAdmin",
name: "LimitCollectionCreationDeletion",
table: "Organization");
}
}

2
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -568,7 +568,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("TEXT");
b.Property<bool>("LimitCollectionCdOwnerAdmin")
b.Property<bool>("LimitCollectionCreationDeletion")
.HasColumnType("INTEGER")
.HasDefaultValue(true);