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

* Do not specify database in migration files

* Rename migrations to force them to re-run

* Use new migration files

* Rename EF migrations

util/Migrator/DbScripts/2021-09-21_01_SplitManageCollectionsJson.sql

@@ -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(

util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.Designer.cs

@@ -9,8 +9,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Bit.MySqlMigrations.Migrations
 {
     [DbContext(typeof(DatabaseContext))]
-    [Migration("20210921200227_SplitManageCollectionsPermissions")]
+    [Migration("20211011144835_SplitManageCollectionsPermissions2")]
-    partial class SplitManageCollectionsPermissions
+    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)");

util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs

@@ -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)
         {

util/MySqlMigrations/MySqlMigrations.csproj

@@ -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>

util/MySqlMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.sql

@@ -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`,

util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.Designer.cs

@@ -10,8 +10,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace Bit.PostgresMigrations.Migrations
 {
     [DbContext(typeof(DatabaseContext))]
-    [Migration("20210921163012_SplitManageCollectionsPermissions")]
+    [Migration("20211011145128_SplitManageCollectionsPermissions2")]
-    partial class SplitManageCollectionsPermissions
+    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)");

util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs

@@ -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)
         {

util/PostgresMigrations/PostgresMigrations.csproj

@@ -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>

util/PostgresMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.psql

@@ -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;