1
0
mirror of https://github.com/bitwarden/server.git synced 2025-06-25 05:08:48 -05:00

PM-20574 updating sql migration to fix database test

This commit is contained in:
Graham Walker 2025-06-10 13:00:08 -05:00
parent 4b952b1109
commit 5c37f56118
No known key found for this signature in database
21 changed files with 44 additions and 8 deletions

View File

@ -9,6 +9,8 @@ BEGIN
DECLARE @BatchSize INT = 100
WHILE @BatchSize > 0
GO
BEGIN
BEGIN TRANSACTION Organization_DeleteById_Ciphers
@ -24,6 +26,8 @@ BEGIN TRANSACTION Organization_DeleteById_Ciphers
COMMIT TRANSACTION Organization_DeleteById_Ciphers
END
GO
BEGIN TRANSACTION Organization_DeleteById
DELETE
@ -159,3 +163,5 @@ WHERE
COMMIT TRANSACTION Organization_DeleteById
END
GO

View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250610173958_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
[Migration("20250610175040_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{
/// <inheritdoc />
@ -682,8 +682,8 @@ namespace Bit.MySqlMigrations.Migrations
.HasColumnType("datetime(6)");
b.Property<string>("ExternalId")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
.HasMaxLength(300)
.HasColumnType("varchar(300)");
b.Property<Guid?>("OrganizationId")
.HasColumnType("char(36)");
@ -1048,6 +1048,9 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
b.Property<string>("DefaultUserCollectionEmail")
.HasColumnType("longtext");
b.Property<string>("ExternalId")
.HasMaxLength(300)
.HasColumnType("varchar(300)");
@ -1062,6 +1065,9 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("RevisionDate")
.HasColumnType("datetime(6)");
b.Property<int>("Type")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("OrganizationId");
@ -1529,6 +1535,10 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<bool>("Disabled")
.HasColumnType("tinyint(1)");
b.Property<string>("Emails")
.HasMaxLength(1024)
.HasColumnType("varchar(1024)");
b.Property<DateTime?>("ExpirationDate")
.HasColumnType("datetime(6)");

View File

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250610172708_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
[Migration("20250610175037_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{
/// <inheritdoc />
@ -685,8 +685,8 @@ namespace Bit.PostgresMigrations.Migrations
.HasColumnType("timestamp with time zone");
b.Property<string>("ExternalId")
.HasMaxLength(50)
.HasColumnType("character varying(50)")
.HasMaxLength(300)
.HasColumnType("character varying(300)")
.UseCollation("postgresIndetermanisticCollation");
b.Property<Guid?>("OrganizationId")
@ -1053,6 +1053,9 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("DefaultUserCollectionEmail")
.HasColumnType("text");
b.Property<string>("ExternalId")
.HasMaxLength(300)
.HasColumnType("character varying(300)");
@ -1067,6 +1070,9 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("RevisionDate")
.HasColumnType("timestamp with time zone");
b.Property<int>("Type")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("OrganizationId");
@ -1534,6 +1540,10 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<bool>("Disabled")
.HasColumnType("boolean");
b.Property<string>("Emails")
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.Property<DateTime?>("ExpirationDate")
.HasColumnType("timestamp with time zone");

View File

@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250610172702_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
[Migration("20250610175044_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{
/// <inheritdoc />
@ -671,7 +671,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasColumnType("TEXT");
b.Property<string>("ExternalId")
.HasMaxLength(50)
.HasMaxLength(300)
.HasColumnType("TEXT");
b.Property<Guid?>("OrganizationId")
@ -1037,6 +1037,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT");
b.Property<string>("DefaultUserCollectionEmail")
.HasColumnType("TEXT");
b.Property<string>("ExternalId")
.HasMaxLength(300)
.HasColumnType("TEXT");
@ -1051,6 +1054,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("RevisionDate")
.HasColumnType("TEXT");
b.Property<int>("Type")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("OrganizationId");
@ -1518,6 +1524,10 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<bool>("Disabled")
.HasColumnType("INTEGER");
b.Property<string>("Emails")
.HasMaxLength(1024)
.HasColumnType("TEXT");
b.Property<DateTime?>("ExpirationDate")
.HasColumnType("TEXT");