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

PM-20574 fixing migration script formatting

This commit is contained in:
Graham Walker 2025-06-13 11:37:07 -05:00
parent 27bce10901
commit c427c36ad6
No known key found for this signature in database
7 changed files with 126 additions and 129 deletions

View File

@ -9,10 +9,8 @@ BEGIN
DECLARE @BatchSize INT = 100 DECLARE @BatchSize INT = 100
WHILE @BatchSize > 0 WHILE @BatchSize > 0
GO BEGIN
BEGIN TRANSACTION Organization_DeleteById_Ciphers
BEGIN
BEGIN TRANSACTION Organization_DeleteById_Ciphers
DELETE TOP(@BatchSize) DELETE TOP(@BatchSize)
FROM FROM
@ -24,31 +22,30 @@ BEGIN TRANSACTION Organization_DeleteById_Ciphers
SET @BatchSize = @@ROWCOUNT SET @BatchSize = @@ROWCOUNT
COMMIT TRANSACTION Organization_DeleteById_Ciphers COMMIT TRANSACTION Organization_DeleteById_Ciphers
END END
GO
GO BEGIN TRANSACTION Organization_DeleteById
BEGIN TRANSACTION Organization_DeleteById DELETE
FROM
DELETE
FROM
[dbo].[AuthRequest] [dbo].[AuthRequest]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[SsoUser] [dbo].[SsoUser]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[SsoConfig] [dbo].[SsoConfig]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE CU DELETE CU
FROM FROM
[dbo].[CollectionUser] CU [dbo].[CollectionUser] CU
INNER JOIN INNER JOIN
@ -72,16 +69,16 @@ DELETE CU
WHERE WHERE
[OU].[OrganizationId] = @Id [OU].[OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[OrganizationUser] [dbo].[OrganizationUser]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[ProviderOrganization] [dbo].[ProviderOrganization]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
EXEC [dbo].[OrganizationApiKey_OrganizationDeleted] @Id EXEC [dbo].[OrganizationApiKey_OrganizationDeleted] @Id
@ -90,19 +87,19 @@ WHERE
EXEC [dbo].[OrganizationDomain_OrganizationDeleted] @Id EXEC [dbo].[OrganizationDomain_OrganizationDeleted] @Id
EXEC [dbo].[OrganizationIntegration_OrganizationDeleted] @Id EXEC [dbo].[OrganizationIntegration_OrganizationDeleted] @Id
DELETE DELETE
FROM FROM
[dbo].[Project] [dbo].[Project]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[Secret] [dbo].[Secret]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
DELETE AK DELETE AK
FROM FROM
[dbo].[ApiKey] AK [dbo].[ApiKey] AK
INNER JOIN INNER JOIN
@ -118,15 +115,15 @@ DELETE AK
WHERE WHERE
[SA].[OrganizationId] = @Id [SA].[OrganizationId] = @Id
DELETE DELETE
FROM FROM
[dbo].[ServiceAccount] [dbo].[ServiceAccount]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
-- Delete Notification Status -- Delete Notification Status
DELETE DELETE
NS NS
FROM FROM
[dbo].[NotificationStatus] NS [dbo].[NotificationStatus] NS
INNER JOIN INNER JOIN
@ -135,33 +132,33 @@ NS
N.[OrganizationId] = @Id N.[OrganizationId] = @Id
-- Delete Notification -- Delete Notification
DELETE DELETE
FROM FROM
[dbo].[Notification] [dbo].[Notification]
WHERE WHERE
[OrganizationId] = @Id [OrganizationId] = @Id
-- Delete Organization Application -- Delete Organization Application
DELETE DELETE
FROM FROM
[dbo].[OrganizationApplication] [dbo].[OrganizationApplication]
WHERE WHERE
[Id] = @Id [Id] = @Id
-- Delete Organization Report -- Delete Organization Report
DELETE DELETE
FROM FROM
[dbo].[OrganizationReport] [dbo].[OrganizationReport]
WHERE WHERE
[Id] = @Id [Id] = @Id
DELETE DELETE
FROM FROM
[dbo].[Organization] [dbo].[Organization]
WHERE WHERE
[Id] = @Id [Id] = @Id
COMMIT TRANSACTION Organization_DeleteById COMMIT TRANSACTION Organization_DeleteById
END END
GO GO

View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations namespace Bit.MySqlMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20250613161051_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] [Migration("20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{ {
/// <inheritdoc /> /// <inheritdoc />

View File

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations namespace Bit.PostgresMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20250613161047_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] [Migration("20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{ {
/// <inheritdoc /> /// <inheritdoc />

View File

@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations namespace Bit.SqliteMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20250613161043_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] [Migration("20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")]
partial class _20250610_02_UpdateOrgDeleteByIdProcsql partial class _20250610_02_UpdateOrgDeleteByIdProcsql
{ {
/// <inheritdoc /> /// <inheritdoc />