nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Sync EF migrations for .NET / EF Core 8 (#4448)

Browse Source 
* Sync EF migrations for .NET 8

* Format

* Redo migrations with billing fix

* Forgot to format again
This commit is contained in:
Matt Bishop 2024-07-02 10:08:34 -04:00 committed by GitHub
parent 554a004d7a
commit e8c5d73062
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 8323 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Billing/Entities/ProviderInvoiceItem.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities;
using System.ComponentModel.DataAnnotations;
using Bit.Core.Entities;
using Bit.Core.Utilities;
namespace Bit.Core.Billing.Entities;
@ -7,9 +8,13 @@ public class ProviderInvoiceItem : ITableObject<Guid>
{
public Guid Id { get; set; }
public Guid ProviderId { get; set; }
[MaxLength(50)]
public string InvoiceId { get; set; }
[MaxLength(50)]
public string InvoiceNumber { get; set; }
[MaxLength(50)]
public string ClientName { get; set; }
[MaxLength(50)]
public string PlanName { get; set; }
public int AssignedSeats { get; set; }
public int UsedSeats { get; set; }

2644
util/MySqlMigrations/Migrations/20240701175219_Net8Sync.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

200
util/MySqlMigrations/Migrations/20240701175219_Net8Sync.cs Normal file
View File

@ -0,0 +1,200 @@
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations;
/// <inheritdoc />
public partial class Net8Sync : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem");
migrationBuilder.AlterColumn<long>(
name: "Id",
table: "SsoUser",
type: "bigint",
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<long>(
name: "Id",
table: "SsoConfig",
type: "bigint",
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "InvoiceNumber",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(255)",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "Grant",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<string>(
name: "Discriminator",
table: "AccessPolicy",
type: "varchar(34)",
maxLength: 34,
nullable: false,
oldClrType: typeof(string),
oldType: "longtext")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<long>(
name: "Id",
table: "SsoUser",
type: "bigint",
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
.OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<long>(
name: "Id",
table: "SsoConfig",
type: "bigint",
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
.OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "InvoiceNumber",
table: "ProviderInvoiceItem",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "varchar(255)",
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "Grant",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
migrationBuilder.AlterColumn<string>(
name: "Discriminator",
table: "AccessPolicy",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(34)",
oldMaxLength: 34)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem",
columns: new[] { "Id", "InvoiceId" },
unique: true);
}
}

29
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -3,6 +3,7 @@ using System;
using Bit.Infrastructure.EntityFramework.Repositories;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
@ -16,9 +17,11 @@ namespace Bit.MySqlMigrations.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.16")
.HasAnnotation("ProductVersion", "8.0.6")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b =>
{
b.Property<Guid>("Id")
@ -496,6 +499,8 @@ namespace Bit.MySqlMigrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("int");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<string>("ClientId")
.IsRequired()
.HasMaxLength(200)
@ -555,6 +560,8 @@ namespace Bit.MySqlMigrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id"));
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
@ -583,6 +590,8 @@ namespace Bit.MySqlMigrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id"));
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
@ -682,19 +691,23 @@ namespace Bit.MySqlMigrations.Migrations
.HasColumnType("int");
b.Property<string>("ClientName")
.HasColumnType("longtext");
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<DateTime>("Created")
.HasColumnType("datetime(6)");
b.Property<string>("InvoiceId")
.HasColumnType("varchar(255)");
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("InvoiceNumber")
.HasColumnType("longtext");
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("PlanName")
.HasColumnType("longtext");
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<Guid>("ProviderId")
.HasColumnType("char(36)");
@ -709,9 +722,6 @@ namespace Bit.MySqlMigrations.Migrations
b.HasIndex("ProviderId");
b.HasIndex("Id", "InvoiceId")
.IsUnique();
b.ToTable("ProviderInvoiceItem", (string)null);
});
@ -1547,7 +1557,8 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("longtext");
.HasMaxLength(34)
.HasColumnType("varchar(34)");
b.Property<bool>("Read")
.HasColumnType("tinyint(1)");

2651
util/PostgresMigrations/Migrations/20240701175214_Net8Sync.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

125
util/PostgresMigrations/Migrations/20240701175214_Net8Sync.cs Normal file
View File

@ -0,0 +1,125 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations;
/// <inheritdoc />
public partial class Net8Sync : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem");
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceNumber",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Discriminator",
table: "AccessPolicy",
type: "character varying(34)",
maxLength: 34,
nullable: false,
oldClrType: typeof(string),
oldType: "text");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceNumber",
table: "ProviderInvoiceItem",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Discriminator",
table: "AccessPolicy",
type: "text",
nullable: false,
oldClrType: typeof(string),
oldType: "character varying(34)",
oldMaxLength: 34);
migrationBuilder.CreateIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem",
columns: new[] { "Id", "InvoiceId" },
unique: true);
}
}

20
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -18,7 +18,7 @@ namespace Bit.PostgresMigrations.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:CollationDefinition:postgresIndetermanisticCollation", "en-u-ks-primary,en-u-ks-primary,icu,False")
.HasAnnotation("ProductVersion", "7.0.16")
.HasAnnotation("ProductVersion", "8.0.6")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -696,19 +696,23 @@ namespace Bit.PostgresMigrations.Migrations
.HasColumnType("integer");
b.Property<string>("ClientName")
.HasColumnType("text");
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<DateTime>("Created")
.HasColumnType("timestamp with time zone");
b.Property<string>("InvoiceId")
.HasColumnType("text");
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("InvoiceNumber")
.HasColumnType("text");
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("PlanName")
.HasColumnType("text");
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("ProviderId")
.HasColumnType("uuid");
@ -723,9 +727,6 @@ namespace Bit.PostgresMigrations.Migrations
b.HasIndex("ProviderId");
b.HasIndex("Id", "InvoiceId")
.IsUnique();
b.ToTable("ProviderInvoiceItem", (string)null);
});
@ -1563,7 +1564,8 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("text");
.HasMaxLength(34)
.HasColumnType("character varying(34)");
b.Property<bool>("Read")
.HasColumnType("boolean");

2633
util/SqliteMigrations/Migrations/20240701175209_Net8Sync.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

27
util/SqliteMigrations/Migrations/20240701175209_Net8Sync.cs Normal file
View File

@ -0,0 +1,27 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations;
/// <inheritdoc />
public partial class Net8Sync : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateIndex(
name: "IX_ProviderInvoiceItem_Id_InvoiceId",
table: "ProviderInvoiceItem",
columns: new[] { "Id", "InvoiceId" },
unique: true);
}
}

10
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -15,7 +15,7 @@ namespace Bit.SqliteMigrations.Migrations
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "7.0.16");
modelBuilder.HasAnnotation("ProductVersion", "8.0.6");
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b =>
{
@ -680,18 +680,22 @@ namespace Bit.SqliteMigrations.Migrations
.HasColumnType("INTEGER");
b.Property<string>("ClientName")
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<DateTime>("Created")
.HasColumnType("TEXT");
b.Property<string>("InvoiceId")
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<string>("InvoiceNumber")
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<string>("PlanName")
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<Guid>("ProviderId")
@ -707,9 +711,6 @@ namespace Bit.SqliteMigrations.Migrations
b.HasIndex("ProviderId");
b.HasIndex("Id", "InvoiceId")
.IsUnique();
b.ToTable("ProviderInvoiceItem", (string)null);
});
@ -1545,6 +1546,7 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<string>("Discriminator")
.IsRequired()
.HasMaxLength(34)
.HasColumnType("TEXT");
b.Property<bool>("Read")