Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-25 17:27:45 +01:00
Code Issues Projects Releases Wiki Activity

⚠️ Do not specify database in migration files (#1628)

Browse Source 
* Do not specify database in migration files

* Rename migrations to force them to re-run

* Use new migration files

* Rename EF migrations
This commit is contained in:
Matt Gibson 2021-10-11 10:20:21 -05:00 committed by GitHub
parent 44f30e7948
commit 7802c2b969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/Migrator/DbScripts/2021-09-21_00_SplitManageCollectionsJson.sql → util/Migrator/DbScripts/2021-09-21_01_SplitManageCollectionsJson.sql
View File

@ -1,5 +1,5 @@
-- Split Manage Assigned Collections into edit and delete
UPDATE [vault_dev].[dbo].[OrganizationUser]
UPDATE [dbo].[OrganizationUser]
SET [Permissions] =
JSON_MODIFY(
JSON_MODIFY(
@ -27,7 +27,7 @@ WHERE [Permissions] IS NOT NULL
)
-- Split Manage All Collections into create, edit, and delete
UPDATE [vault_dev].[dbo].[OrganizationUser]
UPDATE [dbo].[OrganizationUser]
SET [Permissions] =
JSON_MODIFY(
JSON_MODIFY(

10
util/MySqlMigrations/Migrations/20210921200227_SplitManageCollectionsPermissions.Designer.cs → util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.Designer.cs generated
View File

@ -9,8 +9,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20210921200227_SplitManageCollectionsPermissions")]
partial class SplitManageCollectionsPermissions
[Migration("20211011144835_SplitManageCollectionsPermissions2")]
partial class SplitManageCollectionsPermissions2
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@ -505,6 +505,9 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("varchar(100)");
b.Property<int?>("MaxAutoscaleSeats")
.HasColumnType("int");
b.Property<short?>("MaxCollections")
.HasColumnType("smallint");
@ -515,6 +518,9 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<DateTime?>("OwnersNotifiedOfAutoscaling")
.HasColumnType("datetime(6)");
b.Property<string>("Plan")
.HasMaxLength(50)
.HasColumnType("varchar(50)");

4
util/MySqlMigrations/Migrations/20210921200227_SplitManageCollectionsPermissions.cs → util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs
View File

@ -4,10 +4,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace Bit.MySqlMigrations.Migrations
{
public partial class SplitManageCollectionsPermissions : Migration
public partial class SplitManageCollectionsPermissions2 : Migration
{
private const string _scriptLocation =
"MySqlMigrations.Scripts.2021-09-21_00_SplitManageCollectionsPermission.sql";
"MySqlMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.sql";
protected override void Up(MigrationBuilder migrationBuilder)
{

4
util/MySqlMigrations/MySqlMigrations.csproj
View File

@ -17,9 +17,9 @@
</ItemGroup>
<ItemGroup>
<None Remove="Scripts\2021-09-21_00_SplitManageCollectionsPermission.sql" />
<None Remove="Scripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\2021-09-21_00_SplitManageCollectionsPermission.sql" />
<EmbeddedResource Include="Scripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
</ItemGroup>
</Project>

4
util/MySqlMigrations/Scripts/2021-09-21_00_SplitManageCollectionsPermission.sql → util/MySqlMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.sql
View File

@ -1,5 +1,5 @@
-- Split Manage Assigned Collections into edit and delete
UPDATE `bw-vault`.`OrganizationUser`
UPDATE `OrganizationUser`
SET `Permissions` =
JSON_INSERT(
`Permissions`,
@ -24,7 +24,7 @@ WHERE `Permissions` IS NOT NULL
);
-- Split Manage All Collections into create, edit, and delete
UPDATE `bw-vault`.`OrganizationUser`
UPDATE `OrganizationUser`
SET `Permissions` =
JSON_INSERT(
`Permissions`,

10
util/PostgresMigrations/Migrations/20210921163012_SplitManageCollectionsPermissions.Designer.cs → util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.Designer.cs generated
View File

@ -10,8 +10,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20210921163012_SplitManageCollectionsPermissions")]
partial class SplitManageCollectionsPermissions
[Migration("20211011145128_SplitManageCollectionsPermissions2")]
partial class SplitManageCollectionsPermissions2
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@ -509,6 +509,9 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<int?>("MaxAutoscaleSeats")
.HasColumnType("integer");
b.Property<short?>("MaxCollections")
.HasColumnType("smallint");
@ -519,6 +522,9 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<DateTime?>("OwnersNotifiedOfAutoscaling")
.HasColumnType("timestamp without time zone");
b.Property<string>("Plan")
.HasMaxLength(50)
.HasColumnType("character varying(50)");

4
util/PostgresMigrations/Migrations/20210921163012_SplitManageCollectionsPermissions.cs → util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
View File

@ -4,10 +4,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace Bit.PostgresMigrations.Migrations
{
public partial class SplitManageCollectionsPermissions : Migration
public partial class SplitManageCollectionsPermissions2 : Migration
{
private const string _scriptLocation =
"PostgresMigration.Scripts.2021-09-21_00_SplitManageCollectionsPermission.psql";
"PostgresMigration.Scripts.2021-09-21_01_SplitManageCollectionsPermission.psql";
protected override void Up(MigrationBuilder migrationBuilder)
{

4
util/PostgresMigrations/PostgresMigrations.csproj
View File

@ -17,9 +17,9 @@
</ItemGroup>
<ItemGroup>
<None Remove="Scripts\2021-09-21_00_SplitManageCollectionsPermission.psql" />
<None Remove="Scripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\2021-09-21_00_SplitManageCollectionsPermission.psql" />
<EmbeddedResource Include="Scripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
</ItemGroup>
</Project>

2
util/PostgresMigrations/Scripts/2021-09-21_00_SplitManageCollectionsPermission.psql → util/PostgresMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.psql
View File

@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION updatePermissionsJson(permissions jsonb) returns json
END
$$;
UPDATE public."OrganizationUser"
UPDATE "OrganizationUser"
SET "Permissions" = updatePermissionsJson("Permissions"::jsonb)::text
WHERE "Permissions" IS NOT NULL;