From 47eb1ee8e86dcaa233f75f52e039d5b542461964 Mon Sep 17 00:00:00 2001 From: Graham Walker Date: Fri, 13 Jun 2025 11:50:19 -0500 Subject: [PATCH] PM-20574 fixing syntax in migration script --- .../DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql | 5 +---- ...26_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} | 2 +- ...50613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} | 0 ...22_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} | 2 +- ...50613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} | 0 ...30_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} | 2 +- ...50613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} | 0 7 files changed, 4 insertions(+), 7 deletions(-) rename util/MySqlMigrations/Migrations/{20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs => 20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} (99%) rename util/MySqlMigrations/Migrations/{20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs => 20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} (100%) rename util/PostgresMigrations/Migrations/{20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs => 20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} (99%) rename util/PostgresMigrations/Migrations/{20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs => 20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} (100%) rename util/SqliteMigrations/Migrations/{20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs => 20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs} (99%) rename util/SqliteMigrations/Migrations/{20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs => 20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs} (100%) diff --git a/util/Migrator/DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql b/util/Migrator/DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql index 5ac48b8236..9f311a53af 100644 --- a/util/Migrator/DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql +++ b/util/Migrator/DbScripts/2025-06-10_02_UpdateOrgDeleteByIdProc.sql @@ -23,7 +23,6 @@ BEGIN COMMIT TRANSACTION Organization_DeleteById_Ciphers END - GO BEGIN TRANSACTION Organization_DeleteById @@ -157,8 +156,6 @@ BEGIN [dbo].[Organization] WHERE [Id] = @Id - - COMMIT TRANSACTION Organization_DeleteById + COMMIT TRANSACTION Organization_DeleteById END - GO diff --git a/util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs b/util/MySqlMigrations/Migrations/20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs similarity index 99% rename from util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs rename to util/MySqlMigrations/Migrations/20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs index 1d84759116..d3a8dc29db 100644 --- a/util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs +++ b/util/MySqlMigrations/Migrations/20250613164826_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("20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] + [Migration("20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] partial class _20250610_02_UpdateOrgDeleteByIdProcsql { /// diff --git a/util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs b/util/MySqlMigrations/Migrations/20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs similarity index 100% rename from util/MySqlMigrations/Migrations/20250613163557_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs rename to util/MySqlMigrations/Migrations/20250613164826_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs diff --git a/util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs b/util/PostgresMigrations/Migrations/20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs similarity index 99% rename from util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs rename to util/PostgresMigrations/Migrations/20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs index 93faa4af84..e099fa7bc4 100644 --- a/util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs +++ b/util/PostgresMigrations/Migrations/20250613164822_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("20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] + [Migration("20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] partial class _20250610_02_UpdateOrgDeleteByIdProcsql { /// diff --git a/util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs b/util/PostgresMigrations/Migrations/20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs similarity index 100% rename from util/PostgresMigrations/Migrations/20250613163549_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs rename to util/PostgresMigrations/Migrations/20250613164822_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs diff --git a/util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs b/util/SqliteMigrations/Migrations/20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs similarity index 99% rename from util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs rename to util/SqliteMigrations/Migrations/20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs index 15d025e812..98bbbb32a0 100644 --- a/util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.Designer.cs +++ b/util/SqliteMigrations/Migrations/20250613164830_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("20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] + [Migration("20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql")] partial class _20250610_02_UpdateOrgDeleteByIdProcsql { /// diff --git a/util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs b/util/SqliteMigrations/Migrations/20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs similarity index 100% rename from util/SqliteMigrations/Migrations/20250613163553_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs rename to util/SqliteMigrations/Migrations/20250613164830_2025-06-10_02_UpdateOrgDeleteByIdProc.sql.cs