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

[AC-2551] Fix migration files (#4854)

Browse Source 
* Correctly regenerate EF migration files

* Run dotnet format
This commit is contained in:
Alex Morask 2024-10-04 12:05:44 -04:00 committed by GitHub
parent 0496085c39
commit c44988694d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 147 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/MySqlMigrations/Migrations/20241004140901_AddClientOrganizationMigrationRecordTable.cs
View File

@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations
{
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
util/MySqlMigrations/Migrations/20241004140901_AddClientOrganizationMigrationRecordTable.Designer.cs → util/MySqlMigrations/Migrations/20241004154527_AddClientOrganizationMigrationRecordTable.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20241004140901_AddClientOrganizationMigrationRecordTable")]
[Migration("20241004154527_AddClientOrganizationMigrationRecordTable")]
partial class AddClientOrganizationMigrationRecordTable
{
/// <inheritdoc />

50
util/MySqlMigrations/Migrations/20241004154527_AddClientOrganizationMigrationRecordTable.cs Normal file
View File

@ -0,0 +1,50 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations;
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "ClientOrganizationMigrationRecord",
columns: table => new
{
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
OrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
ProviderId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
PlanType = table.Column<byte>(type: "tinyint unsigned", nullable: false),
Seats = table.Column<int>(type: "int", nullable: false),
MaxStorageGb = table.Column<short>(type: "smallint", nullable: true),
GatewayCustomerId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
GatewaySubscriptionId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
ExpirationDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
MaxAutoscaleSeats = table.Column<int>(type: "int", nullable: true),
Status = table.Column<byte>(type: "tinyint unsigned", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
table: "ClientOrganizationMigrationRecord",
columns: new[] { "ProviderId", "OrganizationId" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ClientOrganizationMigrationRecord");
}
}

22
util/PostgresMigrations/Migrations/20241004140910_AddClientOrganizationMigrationRecordTable.cs
View File

@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations
{
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
util/PostgresMigrations/Migrations/20241004140910_AddClientOrganizationMigrationRecordTable.Designer.cs → util/PostgresMigrations/Migrations/20241004154531_AddClientOrganizationMigrationRecordTable.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20241004140910_AddClientOrganizationMigrationRecordTable")]
[Migration("20241004154531_AddClientOrganizationMigrationRecordTable")]
partial class AddClientOrganizationMigrationRecordTable
{
/// <inheritdoc />

47
util/PostgresMigrations/Migrations/20241004154531_AddClientOrganizationMigrationRecordTable.cs Normal file
View File

@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations;
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "ClientOrganizationMigrationRecord",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
OrganizationId = table.Column<Guid>(type: "uuid", nullable: false),
ProviderId = table.Column<Guid>(type: "uuid", nullable: false),
PlanType = table.Column<byte>(type: "smallint", nullable: false),
Seats = table.Column<int>(type: "integer", nullable: false),
MaxStorageGb = table.Column<short>(type: "smallint", nullable: true),
GatewayCustomerId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
GatewaySubscriptionId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
ExpirationDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
MaxAutoscaleSeats = table.Column<int>(type: "integer", nullable: true),
Status = table.Column<byte>(type: "smallint", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
});
migrationBuilder.CreateIndex(
name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
table: "ClientOrganizationMigrationRecord",
columns: new[] { "ProviderId", "OrganizationId" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ClientOrganizationMigrationRecord");
}
}

22
util/SqliteMigrations/Migrations/20241004140906_AddClientOrganizationMigrationRecordTable.cs
View File

@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations
{
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
util/SqliteMigrations/Migrations/20241004140906_AddClientOrganizationMigrationRecordTable.Designer.cs → util/SqliteMigrations/Migrations/20241004154523_AddClientOrganizationMigrationRecordTable.Designer.cs generated
View File

@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20241004140906_AddClientOrganizationMigrationRecordTable")]
[Migration("20241004154523_AddClientOrganizationMigrationRecordTable")]
partial class AddClientOrganizationMigrationRecordTable
{
/// <inheritdoc />

47
util/SqliteMigrations/Migrations/20241004154523_AddClientOrganizationMigrationRecordTable.cs Normal file
View File

@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations;
/// <inheritdoc />
public partial class AddClientOrganizationMigrationRecordTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "ClientOrganizationMigrationRecord",
columns: table => new
{
Id = table.Column<Guid>(type: "TEXT", nullable: false),
OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
ProviderId = table.Column<Guid>(type: "TEXT", nullable: false),
PlanType = table.Column<byte>(type: "INTEGER", nullable: false),
Seats = table.Column<int>(type: "INTEGER", nullable: false),
MaxStorageGb = table.Column<short>(type: "INTEGER", nullable: true),
GatewayCustomerId = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
GatewaySubscriptionId = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
ExpirationDate = table.Column<DateTime>(type: "TEXT", nullable: true),
MaxAutoscaleSeats = table.Column<int>(type: "INTEGER", nullable: true),
Status = table.Column<byte>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
});
migrationBuilder.CreateIndex(
name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
table: "ClientOrganizationMigrationRecord",
columns: new[] { "ProviderId", "OrganizationId" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ClientOrganizationMigrationRecord");
}
}