nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-12 13:19:01 -05:00
Code Activity

Add Notes column to OrganizationSponsorships table

Browse Source
This commit is contained in:
Jonas Hendrickx
2025-03-26 10:29:53 +01:00
parent c457b0bb9c
commit bbb109cba8
26 changed files with 120 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
util/Migrator/DbScripts/2025-03-14_00_AddUseAdminInitiatedSponsorship.sql
View File

@ -364,7 +364,8 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationSponsorship_Update]
@ToDelete BIT,
@LastSyncDate DATETIME2 (7),
@ValidUntil DATETIME2 (7),
@IsAdminInitiated BIT
@IsAdminInitiated BIT,
@Notes NVARCHAR(512)
AS
BEGIN
SET NOCOUNT ON
@ -381,7 +382,8 @@ SET
[ToDelete] = @ToDelete,
[LastSyncDate] = @LastSyncDate,
[ValidUntil] = @ValidUntil,
[IsAdminInitiated] = @IsAdminInitiated
[IsAdminInitiated] = @IsAdminInitiated,
[Notes] = @Notes
WHERE
[Id] = @Id
END
@ -398,7 +400,8 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationSponsorship_Create]
@ToDelete BIT,
@LastSyncDate DATETIME2 (7),
@ValidUntil DATETIME2 (7),
@IsAdminInitiated BIT
@IsAdminInitiated BIT,
@Notes NVARCHAR(512)
AS
BEGIN
SET NOCOUNT ON
@ -415,7 +418,8 @@ BEGIN
[ToDelete],
[LastSyncDate],
[ValidUntil],
[IsAdminInitiated]
[IsAdminInitiated],
[Notes]
)
VALUES
(
@ -429,7 +433,8 @@ BEGIN
@ToDelete,
@LastSyncDate,
@ValidUntil,
@IsAdminInitiated
@IsAdminInitiated,
@Notes
)
END
GO;
@ -449,7 +454,8 @@ CREATE TYPE [dbo].[OrganizationSponsorshipType] AS TABLE(
[LastSyncDate] DATETIME2(7),
[ValidUntil] DATETIME2(7),
[ToDelete] BIT,
[IsAdminInitiated] BIT
[IsAdminInitiated] BIT,
[Notes] NVARCHAR(512)
);
GO;
@ -471,7 +477,8 @@ BEGIN
[ToDelete],
[LastSyncDate],
[ValidUntil],
[IsAdminInitiated]
[IsAdminInitiated],
[Notes]
)
SELECT
OS.[Id],
@ -484,7 +491,8 @@ SELECT
OS.[ToDelete],
OS.[LastSyncDate],
OS.[ValidUntil],
OS.[IsAdminInitiated]
OS.[IsAdminInitiated],
OS.[Notes]
FROM
@OrganizationSponsorshipsInput OS
END
@ -509,7 +517,8 @@ SET
[ToDelete] = OSI.[ToDelete],
[LastSyncDate] = OSI.[LastSyncDate],
[ValidUntil] = OSI.[ValidUntil],
[IsAdminInitiated] = OSI.[IsAdminInitiated]
[IsAdminInitiated] = OSI.[IsAdminInitiated],
[Notes] = OSI.[Notes]
FROM
[dbo].[OrganizationSponsorship] OS
INNER JOIN

5
util/MySqlMigrations/Migrations/20250312084349_PM17830_AdminInitiatedSponsorships.Designer.cs → util/MySqlMigrations/Migrations/20250326092653_PM17830_AdminInitiatedSponsorships.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250312084349_PM17830_AdminInitiatedSponsorships")]
[Migration("20250326092653_PM17830_AdminInitiatedSponsorships")]
partial class PM17830_AdminInitiatedSponsorships
{
/// <inheritdoc />
@ -1261,6 +1261,9 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("datetime(6)");
b.Property<string>("Notes")
.HasColumnType("longtext");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("varchar(256)");

11
util/MySqlMigrations/Migrations/20250312084349_PM17830_AdminInitiatedSponsorships.cs → util/MySqlMigrations/Migrations/20250326092653_PM17830_AdminInitiatedSponsorships.cs
View File

@ -17,6 +17,13 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "Notes",
table: "OrganizationSponsorship",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<bool>(
name: "UseAdminSponsoredFamilies",
table: "Organization",
@ -32,6 +39,10 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
name: "IsAdminInitiated",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "Notes",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "UseAdminSponsoredFamilies",
table: "Organization");

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

@ -1258,6 +1258,9 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("datetime(6)");
b.Property<string>("Notes")
.HasColumnType("longtext");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("varchar(256)");

5
util/PostgresMigrations/Migrations/20250312084357_PM17830_AdminInitiatedSponsorships.Designer.cs → util/PostgresMigrations/Migrations/20250326092700_PM17830_AdminInitiatedSponsorships.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250312084357_PM17830_AdminInitiatedSponsorships")]
[Migration("20250326092700_PM17830_AdminInitiatedSponsorships")]
partial class PM17830_AdminInitiatedSponsorships
{
/// <inheritdoc />
@ -1266,6 +1266,9 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("Notes")
.HasColumnType("text");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("character varying(256)");

10
util/PostgresMigrations/Migrations/20250312084357_PM17830_AdminInitiatedSponsorships.cs → util/PostgresMigrations/Migrations/20250326092700_PM17830_AdminInitiatedSponsorships.cs
View File

@ -17,6 +17,12 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "Notes",
table: "OrganizationSponsorship",
type: "text",
nullable: true);
migrationBuilder.AddColumn<bool>(
name: "UseAdminSponsoredFamilies",
table: "Organization",
@ -32,6 +38,10 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
name: "IsAdminInitiated",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "Notes",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "UseAdminSponsoredFamilies",
table: "Organization");

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

@ -1263,6 +1263,9 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("Notes")
.HasColumnType("text");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("character varying(256)");

5
util/SqliteMigrations/Migrations/20250312084403_PM17830_AdminInitiatedSponsorships.Designer.cs → util/SqliteMigrations/Migrations/20250326092645_PM17830_AdminInitiatedSponsorships.Designer.cs generated
View File

@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250312084403_PM17830_AdminInitiatedSponsorships")]
[Migration("20250326092645_PM17830_AdminInitiatedSponsorships")]
partial class PM17830_AdminInitiatedSponsorships
{
/// <inheritdoc />
@ -1250,6 +1250,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("TEXT");
b.Property<string>("Notes")
.HasColumnType("TEXT");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");

10
util/SqliteMigrations/Migrations/20250312084403_PM17830_AdminInitiatedSponsorships.cs → util/SqliteMigrations/Migrations/20250326092645_PM17830_AdminInitiatedSponsorships.cs
View File

@ -17,6 +17,12 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "Notes",
table: "OrganizationSponsorship",
type: "TEXT",
nullable: true);
migrationBuilder.AddColumn<bool>(
name: "UseAdminSponsoredFamilies",
table: "Organization",
@ -32,6 +38,10 @@ public partial class PM17830_AdminInitiatedSponsorships : Migration
name: "IsAdminInitiated",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "Notes",
table: "OrganizationSponsorship");
migrationBuilder.DropColumn(
name: "UseAdminSponsoredFamilies",
table: "Organization");

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

@ -1247,6 +1247,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime?>("LastSyncDate")
.HasColumnType("TEXT");
b.Property<string>("Notes")
.HasColumnType("TEXT");
b.Property<string>("OfferedToEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");