PM-20574 fixing migration script formatting

util/Migrator/DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql

@@ -9,159 +9,156 @@ BEGIN
 
     DECLARE @BatchSize INT = 100
     WHILE @BatchSize > 0
-GO
+    BEGIN
+    BEGIN TRANSACTION Organization_DeleteById_Ciphers
 
-BEGIN
+            DELETE TOP(@BatchSize)
-BEGIN TRANSACTION Organization_DeleteById_Ciphers
+            FROM
+                [dbo].[Cipher]
+            WHERE
+                [UserId] IS NULL
+                AND [OrganizationId] = @Id
 
-        DELETE TOP(@BatchSize)
+            SET @BatchSize = @@ROWCOUNT
+
+            COMMIT TRANSACTION Organization_DeleteById_Ciphers
+    END
+    GO
+
+    BEGIN TRANSACTION Organization_DeleteById
+
+    DELETE
+    FROM
+        [dbo].[AuthRequest]
+    WHERE
+        [OrganizationId] = @Id
+
+    DELETE
+    FROM
+        [dbo].[SsoUser]
+    WHERE
+        [OrganizationId] = @Id
+
+    DELETE
+    FROM
+        [dbo].[SsoConfig]
+    WHERE
+        [OrganizationId] = @Id
+
+    DELETE CU
         FROM
-            [dbo].[Cipher]
+            [dbo].[CollectionUser] CU
+        INNER JOIN
+            [dbo].[OrganizationUser] OU ON [CU].[OrganizationUserId] = [OU].[Id]
         WHERE
-            [UserId] IS NULL
+            [OU].[OrganizationId] = @Id
-            AND [OrganizationId] = @Id
 
-        SET @BatchSize = @@ROWCOUNT
+        DELETE AP
+        FROM
+            [dbo].[AccessPolicy] AP
+        INNER JOIN
+            [dbo].[OrganizationUser] OU ON [AP].[OrganizationUserId] = [OU].[Id]
+        WHERE
+            [OU].[OrganizationId] = @Id
 
-        COMMIT TRANSACTION Organization_DeleteById_Ciphers
+        DELETE GU
-END
+        FROM
+            [dbo].[GroupUser] GU
+        INNER JOIN
+            [dbo].[OrganizationUser] OU ON [GU].[OrganizationUserId] = [OU].[Id]
+        WHERE
+            [OU].[OrganizationId] = @Id
 
-GO
+    DELETE
-
-BEGIN TRANSACTION Organization_DeleteById
-
-DELETE
-FROM
-    [dbo].[AuthRequest]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE
-FROM
-    [dbo].[SsoUser]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE
-FROM
-    [dbo].[SsoConfig]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE CU
     FROM
-        [dbo].[CollectionUser] CU
+        [dbo].[OrganizationUser]
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON [CU].[OrganizationUserId] = [OU].[Id]
     WHERE
-        [OU].[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-    DELETE AP
+    DELETE
     FROM
-        [dbo].[AccessPolicy] AP
+        [dbo].[ProviderOrganization]
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON [AP].[OrganizationUserId] = [OU].[Id]
     WHERE
-        [OU].[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-    DELETE GU
+        EXEC [dbo].[OrganizationApiKey_OrganizationDeleted] @Id
+        EXEC [dbo].[OrganizationConnection_OrganizationDeleted] @Id
+        EXEC [dbo].[OrganizationSponsorship_OrganizationDeleted] @Id
+        EXEC [dbo].[OrganizationDomain_OrganizationDeleted] @Id
+        EXEC [dbo].[OrganizationIntegration_OrganizationDeleted] @Id
+
+    DELETE
     FROM
-        [dbo].[GroupUser] GU
+        [dbo].[Project]
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON [GU].[OrganizationUserId] = [OU].[Id]
     WHERE
-        [OU].[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-DELETE
+    DELETE
-FROM
-    [dbo].[OrganizationUser]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE
-FROM
-    [dbo].[ProviderOrganization]
-WHERE
-    [OrganizationId] = @Id
-
-    EXEC [dbo].[OrganizationApiKey_OrganizationDeleted] @Id
-    EXEC [dbo].[OrganizationConnection_OrganizationDeleted] @Id
-    EXEC [dbo].[OrganizationSponsorship_OrganizationDeleted] @Id
-    EXEC [dbo].[OrganizationDomain_OrganizationDeleted] @Id
-    EXEC [dbo].[OrganizationIntegration_OrganizationDeleted] @Id
-
-DELETE
-FROM
-    [dbo].[Project]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE
-FROM
-    [dbo].[Secret]
-WHERE
-    [OrganizationId] = @Id
-
-DELETE AK
     FROM
-        [dbo].[ApiKey] AK
+        [dbo].[Secret]
-    INNER JOIN
-        [dbo].[ServiceAccount] SA ON [AK].[ServiceAccountId] = [SA].[Id]
     WHERE
-        [SA].[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-    DELETE AP
+    DELETE AK
+        FROM
+            [dbo].[ApiKey] AK
+        INNER JOIN
+            [dbo].[ServiceAccount] SA ON [AK].[ServiceAccountId] = [SA].[Id]
+        WHERE
+            [SA].[OrganizationId] = @Id
+
+        DELETE AP
+        FROM
+            [dbo].[AccessPolicy] AP
+        INNER JOIN
+            [dbo].[ServiceAccount] SA ON [AP].[GrantedServiceAccountId] = [SA].[Id]
+        WHERE
+            [SA].[OrganizationId] = @Id
+
+    DELETE
     FROM
-        [dbo].[AccessPolicy] AP
+        [dbo].[ServiceAccount]
-    INNER JOIN
-        [dbo].[ServiceAccount] SA ON [AP].[GrantedServiceAccountId] = [SA].[Id]
     WHERE
-        [SA].[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-DELETE
+    -- Delete Notification Status
-FROM
+    DELETE
-    [dbo].[ServiceAccount]
+    NS
-WHERE
+        FROM
-    [OrganizationId] = @Id
+            [dbo].[NotificationStatus] NS
+        INNER JOIN
+            [dbo].[Notification] N ON N.[Id] = NS.[NotificationId]
+        WHERE
+            N.[OrganizationId] = @Id
 
--- Delete Notification Status
+        -- Delete Notification
-DELETE
+    DELETE
-NS
     FROM
-        [dbo].[NotificationStatus] NS
+        [dbo].[Notification]
-    INNER JOIN
-        [dbo].[Notification] N ON N.[Id] = NS.[NotificationId]
     WHERE
-        N.[OrganizationId] = @Id
+        [OrganizationId] = @Id
 
-    -- Delete Notification
+    -- Delete Organization Application
-DELETE
+    DELETE
-FROM
+    FROM
-    [dbo].[Notification]
+        [dbo].[OrganizationApplication]
-WHERE
+    WHERE
-    [OrganizationId] = @Id
+        [Id] = @Id
 
--- Delete Organization Application
+    -- Delete Organization Report
-DELETE
+    DELETE
-FROM
+    FROM
-    [dbo].[OrganizationApplication]
+        [dbo].[OrganizationReport]
-WHERE
+    WHERE
-    [Id] = @Id
+        [Id] = @Id
 
--- Delete Organization Report
+    DELETE
-DELETE
+    FROM
-FROM
+        [dbo].[Organization]
-    [dbo].[OrganizationReport]
+    WHERE
-WHERE
+        [Id] = @Id
-    [Id] = @Id
 
-DELETE
+        COMMIT TRANSACTION Organization_DeleteById
-FROM
+    END
-    [dbo].[Organization]
-WHERE
-    [Id] = @Id
 
-    COMMIT TRANSACTION Organization_DeleteById
+    GO
-END
-
-GO

util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs

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

util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs

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

util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs

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