nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 16:42:50 -05:00
Code Activity

[AC-1682] Removed MySql transaction from script because EF migration already wraps it under its own transaction

Browse Source
This commit is contained in:
Rui Tome
2024-03-29 12:03:29 +00:00
parent c20912f95c
commit 7b54d78d67
3 changed files with 89 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/MySqlMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.sql
View File

@ -33,8 +33,6 @@
`OU`.`Permissions` IS NOT NULL AND `OU`.`Permissions` IS NOT NULL AND
JSON_VALID(`OU`.`Permissions`) AND JSON_VALUE(`OU`.`Permissions`, '$.editAssignedCollections') = 'true')); JSON_VALID(`OU`.`Permissions`) AND JSON_VALUE(`OU`.`Permissions`, '$.editAssignedCollections') = 'true'));
-- Start transaction
START TRANSACTION;
-- Step 1 -- Step 1
-- Update existing rows in `CollectionGroups` -- Update existing rows in `CollectionGroups`
UPDATE `CollectionGroups` `CG` UPDATE `CollectionGroups` `CG`
@ -132,15 +130,11 @@ START TRANSACTION;
) AS `CombinedOrgUsers` ON `OU`.`Id` = `CombinedOrgUsers`.`OrganizationUserId` ) AS `CombinedOrgUsers` ON `OU`.`Id` = `CombinedOrgUsers`.`OrganizationUserId`
SET `U`.`AccountRevisionDate` = UTC_TIMESTAMP(); SET `U`.`AccountRevisionDate` = UTC_TIMESTAMP();
-- Step 5 -- Step 5: Set `FlexibleCollections` = 1 for all organizations that have not yet been migrated.
-- Set `FlexibleCollections` = 1 for all organizations that have not yet been migrated.
UPDATE `Organization` UPDATE `Organization`
SET `FlexibleCollections` = 1 SET `FlexibleCollections` = 1
WHERE `FlexibleCollections` = 0; WHERE `FlexibleCollections` = 0;
-- Commit transaction
COMMIT;
-- Step 6: Drop the temporary tables -- Step 6: Drop the temporary tables
DROP TEMPORARY TABLE IF EXISTS `TempGroupsAccessAll`; DROP TEMPORARY TABLE IF EXISTS `TempGroupsAccessAll`;
DROP TEMPORARY TABLE IF EXISTS `TempUsersAccessAll`; DROP TEMPORARY TABLE IF EXISTS `TempUsersAccessAll`;

3
util/PostgresMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.psql
View File

@ -123,8 +123,7 @@
SELECT "OrganizationUserId" FROM "TempUserManagers" SELECT "OrganizationUserId" FROM "TempUserManagers"
); );
-- Step 5 -- Step 5: Set "FlexibleCollections" = true for all organizations that have not yet been migrated.
-- Set "FlexibleCollections" = true for all organizations that have not yet been migrated.
UPDATE "Organization" UPDATE "Organization"
SET "FlexibleCollections" = true SET "FlexibleCollections" = true
WHERE "FlexibleCollections" = false; WHERE "FlexibleCollections" = false;

3
util/SqliteMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.sql
View File

@ -141,8 +141,7 @@
) AS "CombinedOrgUsers" ON "OU"."Id" = "CombinedOrgUsers"."OrganizationUserId" ) AS "CombinedOrgUsers" ON "OU"."Id" = "CombinedOrgUsers"."OrganizationUserId"
); );
-- Step 5 -- Step 5: Set "FlexibleCollections" = 1 for all organizations that have not yet been migrated.
-- Set "FlexibleCollections" = 1 for all organizations that have not yet been migrated.
UPDATE "Organization" UPDATE "Organization"
SET "FlexibleCollections" = 1 SET "FlexibleCollections" = 1
WHERE "FlexibleCollections" = 0; WHERE "FlexibleCollections" = 0;