Merge branch 'main' into ac/ac-1682/data-migrations-for-deprecated-permissions

2025-07-02 16:42:50 -05:00 · 2024-01-17 13:31:21 +00:00
parent 667f3cdd00 96f9fbb951
commit 7a8cbd6dd8
80 changed files with 1777 additions and 656 deletions
--- a/util/MySqlMigrations/Migrations/20231214162533_GrantIdWithIndexes.cs
+++ b/util/MySqlMigrations/Migrations/20231214162533_GrantIdWithIndexes.cs
@ -72,7 +72,22 @@ public partial class GrantIdWithIndexes : Migration
            .Annotation("MySql:CharSet", "utf8mb4")
            .OldAnnotation("MySql:CharSet", "utf8mb4");

-        migrationBuilder.Sql("ALTER TABLE `Grant` ADD COLUMN `Id` INT AUTO_INCREMENT UNIQUE;");
+        migrationBuilder.Sql(@"
+            DROP PROCEDURE IF EXISTS GrantSchemaChange;
+            
+            CREATE PROCEDURE GrantSchemaChange()
+            BEGIN
+                IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Grant' AND COLUMN_NAME = 'Id') THEN
+                    ALTER TABLE `Grant` DROP COLUMN `Id`;
+                END IF;
+ 
+                ALTER TABLE `Grant` ADD COLUMN `Id` INT AUTO_INCREMENT UNIQUE;
+            END;
+
+            CALL GrantSchemaChange();
+
+            DROP PROCEDURE GrantSchemaChange;"
+        );

        migrationBuilder.AddPrimaryKey(
            name: "PK_Grant",
--- a/util/MySqlMigrations/MySqlMigrations.csproj
+++ b/util/MySqlMigrations/MySqlMigrations.csproj
@ -10,7 +10,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
--- a/util/PostgresMigrations/PostgresMigrations.csproj
+++ b/util/PostgresMigrations/PostgresMigrations.csproj
@ -6,7 +6,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
--- a/util/SqlServerEFScaffold/SqlServerEFScaffold.csproj
+++ b/util/SqlServerEFScaffold/SqlServerEFScaffold.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
--- a/util/SqliteMigrations/HelperScripts/2023-12-04_00_Down_GrantIndexes.sql
+++ b/util/SqliteMigrations/HelperScripts/2023-12-04_00_Down_GrantIndexes.sql
@ -0,0 +1,45 @@
+ALTER TABLE
+"Grant" RENAME TO "Old_Grant";
+
+CREATE TABLE "Grant"
+(
+  "Key" TEXT NOT NULL CONSTRAINT "PK_Grant" PRIMARY KEY,
+  "Type" TEXT NULL,
+  "SubjectId" TEXT NULL,
+  "SessionId" TEXT NULL,
+  "ClientId" TEXT NULL,
+  "Description" TEXT NULL,
+  "CreationDate" TEXT NOT NULL,
+  "ExpirationDate" TEXT NULL,
+  "ConsumedDate" TEXT NULL,
+  "Data" TEXT NULL
+);
+
+INSERT INTO
+"Grant"
+  (
+  "Key",
+  "Type",
+  "SubjectId",
+  "SessionId",
+  "ClientId",
+  "Description",
+  "CreationDate",
+  "ExpirationDate",
+  "ConsumedDate",
+  "Data"
+  )
+SELECT
+  "Key",
+  "Type",
+  "SubjectId",
+  "SessionId",
+  "ClientId",
+  "Description",
+  "CreationDate",
+  "ExpirationDate",
+  "ConsumedDate",
+  "Data"
+FROM "Old_Grant";
+
+DROP TABLE "Old_Grant";
--- a/util/SqliteMigrations/HelperScripts/2023-12-04_00_Up_GrantIndexes.sql
+++ b/util/SqliteMigrations/HelperScripts/2023-12-04_00_Up_GrantIndexes.sql
@ -0,0 +1,46 @@
+ALTER TABLE
+"Grant" RENAME TO "Old_Grant";
+
+CREATE TABLE "Grant"
+(
+  "Id" INTEGER PRIMARY KEY AUTOINCREMENT,
+  "Key" TEXT NOT NULL,
+  "Type" TEXT NOT NULL,
+  "SubjectId" TEXT NULL,
+  "SessionId" TEXT NULL,
+  "ClientId" TEXT NOT NULL,
+  "Description" TEXT NULL,
+  "CreationDate" TEXT NOT NULL,
+  "ExpirationDate" TEXT NULL,
+  "ConsumedDate" TEXT NULL,
+  "Data" TEXT NOT NULL
+);
+
+INSERT INTO
+"Grant"
+  (
+  "Key",
+  "Type",
+  "SubjectId",
+  "SessionId",
+  "ClientId",
+  "Description",
+  "CreationDate",
+  "ExpirationDate",
+  "ConsumedDate",
+  "Data"
+  )
+SELECT
+  "Key",
+  "Type",
+  "SubjectId",
+  "SessionId",
+  "ClientId",
+  "Description",
+  "CreationDate",
+  "ExpirationDate",
+  "ConsumedDate",
+  "Data"
+FROM "Old_Grant";
+
+DROP TABLE "Old_Grant";
--- a/util/SqliteMigrations/Migrations/20231214162537_GrantIdWithIndexes.cs
+++ b/util/SqliteMigrations/Migrations/20231214162537_GrantIdWithIndexes.cs
@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Bit.EfShared;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

@ -7,59 +8,12 @@ namespace Bit.SqliteMigrations.Migrations;
 /// <inheritdoc />
 public partial class GrantIdWithIndexes : Migration
 {
+    private const string _scriptLocationTemplate = "2023-12-04_00_{0}_GrantIndexes.sql";
+
    /// <inheritdoc />
    protected override void Up(MigrationBuilder migrationBuilder)
    {
-        migrationBuilder.DropPrimaryKey(
-            name: "PK_Grant",
-            table: "Grant");
-
-        migrationBuilder.AlterColumn<string>(
-            name: "Type",
-            table: "Grant",
-            type: "TEXT",
-            maxLength: 50,
-            nullable: false,
-            defaultValue: "",
-            oldClrType: typeof(string),
-            oldType: "TEXT",
-            oldMaxLength: 50,
-            oldNullable: true);
-
-        migrationBuilder.AlterColumn<string>(
-            name: "Data",
-            table: "Grant",
-            type: "TEXT",
-            nullable: false,
-            defaultValue: "",
-            oldClrType: typeof(string),
-            oldType: "TEXT",
-            oldNullable: true);
-
-        migrationBuilder.AlterColumn<string>(
-            name: "ClientId",
-            table: "Grant",
-            type: "TEXT",
-            maxLength: 200,
-            nullable: false,
-            defaultValue: "",
-            oldClrType: typeof(string),
-            oldType: "TEXT",
-            oldMaxLength: 200,
-            oldNullable: true);
-
-        migrationBuilder.AddColumn<int>(
-            name: "Id",
-            table: "Grant",
-            type: "INTEGER",
-            nullable: false,
-            defaultValue: 0)
-            .Annotation("Sqlite:Autoincrement", true);
-
-        migrationBuilder.AddPrimaryKey(
-            name: "PK_Grant",
-            table: "Grant",
-            column: "Id");
+        migrationBuilder.SqlResource(_scriptLocationTemplate);

        migrationBuilder.CreateIndex(
            name: "IX_Grant_Key",
@ -71,49 +25,10 @@ public partial class GrantIdWithIndexes : Migration
    /// <inheritdoc />
    protected override void Down(MigrationBuilder migrationBuilder)
    {
-        migrationBuilder.DropPrimaryKey(
-            name: "PK_Grant",
-            table: "Grant");
+        migrationBuilder.SqlResource(_scriptLocationTemplate);

        migrationBuilder.DropIndex(
            name: "IX_Grant_Key",
            table: "Grant");
-
-        migrationBuilder.DropColumn(
-            name: "Id",
-            table: "Grant");
-
-        migrationBuilder.AlterColumn<string>(
-            name: "Type",
-            table: "Grant",
-            type: "TEXT",
-            maxLength: 50,
-            nullable: true,
-            oldClrType: typeof(string),
-            oldType: "TEXT",
-            oldMaxLength: 50);
-
-        migrationBuilder.AlterColumn<string>(
-            name: "Data",
-            table: "Grant",
-            type: "TEXT",
-            nullable: true,
-            oldClrType: typeof(string),
-            oldType: "TEXT");
-
-        migrationBuilder.AlterColumn<string>(
-            name: "ClientId",
-            table: "Grant",
-            type: "TEXT",
-            maxLength: 200,
-            nullable: true,
-            oldClrType: typeof(string),
-            oldType: "TEXT",
-            oldMaxLength: 200);
-
-        migrationBuilder.AddPrimaryKey(
-            name: "PK_Grant",
-            table: "Grant",
-            column: "Key");
    }
 }
--- a/util/SqliteMigrations/SqliteMigrations.csproj
+++ b/util/SqliteMigrations/SqliteMigrations.csproj
@ -12,7 +12,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
@ -22,4 +22,9 @@
    <Compile Include="..\EfShared\MigrationBuilderExtensions.cs" />
  </ItemGroup>

+  <ItemGroup>
+    <EmbeddedResource Include="HelperScripts\2023-12-04_00_Up_GrantIndexes.sql" />
+    <EmbeddedResource Include="HelperScripts\2023-12-04_00_Down_GrantIndexes.sql" />
+  </ItemGroup>
+
 </Project>