mirror of
https://github.com/bitwarden/server.git
synced 2025-06-30 07:36:14 -05:00
Turn on file scoped namespaces (#2225)
This commit is contained in:
Justin Baur
@ -4,35 +4,34 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Design;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace MySqlMigrations
|
||||
{
|
||||
public static class GlobalSettingsFactory
|
||||
{
|
||||
public static GlobalSettings GlobalSettings { get; } = new GlobalSettings();
|
||||
static GlobalSettingsFactory()
|
||||
{
|
||||
var configBuilder = new ConfigurationBuilder().AddUserSecrets<Bit.Api.Startup>();
|
||||
var Configuration = configBuilder.Build();
|
||||
ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), GlobalSettings);
|
||||
}
|
||||
}
|
||||
namespace MySqlMigrations;
|
||||
|
||||
public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContext>
|
||||
public static class GlobalSettingsFactory
|
||||
{
|
||||
public static GlobalSettings GlobalSettings { get; } = new GlobalSettings();
|
||||
static GlobalSettingsFactory()
|
||||
{
|
||||
public DatabaseContext CreateDbContext(string[] args)
|
||||
{
|
||||
var globalSettings = GlobalSettingsFactory.GlobalSettings;
|
||||
var optionsBuilder = new DbContextOptionsBuilder<DatabaseContext>();
|
||||
var connectionString = globalSettings.MySql?.ConnectionString;
|
||||
if (string.IsNullOrWhiteSpace(connectionString))
|
||||
{
|
||||
throw new Exception("No MySql connection string found.");
|
||||
}
|
||||
optionsBuilder.UseMySql(
|
||||
connectionString,
|
||||
ServerVersion.AutoDetect(connectionString),
|
||||
b => b.MigrationsAssembly("MySqlMigrations"));
|
||||
return new DatabaseContext(optionsBuilder.Options);
|
||||
}
|
||||
var configBuilder = new ConfigurationBuilder().AddUserSecrets<Bit.Api.Startup>();
|
||||
var Configuration = configBuilder.Build();
|
||||
ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), GlobalSettings);
|
||||
}
|
||||
}
|
||||
|
||||
public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContext>
|
||||
{
|
||||
public DatabaseContext CreateDbContext(string[] args)
|
||||
{
|
||||
var globalSettings = GlobalSettingsFactory.GlobalSettings;
|
||||
var optionsBuilder = new DbContextOptionsBuilder<DatabaseContext>();
|
||||
var connectionString = globalSettings.MySql?.ConnectionString;
|
||||
if (string.IsNullOrWhiteSpace(connectionString))
|
||||
{
|
||||
throw new Exception("No MySql connection string found.");
|
||||
}
|
||||
optionsBuilder.UseMySql(
|
||||
connectionString,
|
||||
ServerVersion.AutoDetect(connectionString),
|
||||
b => b.MigrationsAssembly("MySqlMigrations"));
|
||||
return new DatabaseContext(optionsBuilder.Options);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,90 +1,89 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class RemoveProviderOrganizationProviderUser : Migration
|
||||
{
|
||||
public partial class RemoveProviderOrganizationProviderUser : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "ProviderOrganizationProviderUser");
|
||||
migrationBuilder.DropTable(
|
||||
name: "ProviderOrganizationProviderUser");
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseEvents",
|
||||
table: "Provider",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseEvents",
|
||||
table: "Provider",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderUserId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderUserId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseEvents",
|
||||
table: "Provider");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseEvents",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderId",
|
||||
table: "Event");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderId",
|
||||
table: "Event");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderUserId",
|
||||
table: "Event");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderUserId",
|
||||
table: "Event");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ProviderOrganizationProviderUser",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
CreationDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
Permissions = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
ProviderOrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
ProviderUserId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
RevisionDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ProviderOrganizationProviderUser", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderOrganizationProviderUser_ProviderOrganization_Provid~",
|
||||
column: x => x.ProviderOrganizationId,
|
||||
principalTable: "ProviderOrganization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderOrganizationProviderUser_ProviderUser_ProviderUserId",
|
||||
column: x => x.ProviderUserId,
|
||||
principalTable: "ProviderUser",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ProviderOrganizationProviderUser",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
CreationDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
Permissions = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
ProviderOrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
ProviderUserId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
RevisionDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ProviderOrganizationProviderUser", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderOrganizationProviderUser_ProviderOrganization_Provid~",
|
||||
column: x => x.ProviderOrganizationId,
|
||||
principalTable: "ProviderOrganization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderOrganizationProviderUser_ProviderUser_ProviderUserId",
|
||||
column: x => x.ProviderUserId,
|
||||
principalTable: "ProviderUser",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderOrganizationProviderUser_ProviderOrganizationId",
|
||||
table: "ProviderOrganizationProviderUser",
|
||||
column: "ProviderOrganizationId");
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderOrganizationProviderUser_ProviderOrganizationId",
|
||||
table: "ProviderOrganizationProviderUser",
|
||||
column: "ProviderOrganizationId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderOrganizationProviderUser_ProviderUserId",
|
||||
table: "ProviderOrganizationProviderUser",
|
||||
column: "ProviderUserId");
|
||||
}
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderOrganizationProviderUser_ProviderUserId",
|
||||
table: "ProviderOrganizationProviderUser",
|
||||
column: "ProviderUserId");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class UserForcePasswordReset : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "ForcePasswordReset",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ForcePasswordReset",
|
||||
table: "User");
|
||||
}
|
||||
public partial class UserForcePasswordReset : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "ForcePasswordReset",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ForcePasswordReset",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,44 +1,43 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class AddMaxAutoscaleSeatsToOrganization : Migration
|
||||
{
|
||||
public partial class AddMaxAutoscaleSeatsToOrganization : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "MaxAutoscaleSeats",
|
||||
table: "Organization",
|
||||
type: "int",
|
||||
nullable: true);
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "MaxAutoscaleSeats",
|
||||
table: "Organization",
|
||||
type: "int",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "OwnersNotifiedOfAutoscaling",
|
||||
table: "Organization",
|
||||
type: "datetime(6)",
|
||||
nullable: true);
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "OwnersNotifiedOfAutoscaling",
|
||||
table: "Organization",
|
||||
type: "datetime(6)",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderOrganizationId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderOrganizationId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "MaxAutoscaleSeats",
|
||||
table: "Organization");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "MaxAutoscaleSeats",
|
||||
table: "Organization");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "OwnersNotifiedOfAutoscaling",
|
||||
table: "Organization");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "OwnersNotifiedOfAutoscaling",
|
||||
table: "Organization");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderOrganizationId",
|
||||
table: "Event");
|
||||
}
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderOrganizationId",
|
||||
table: "Event");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
using Bit.Core.Utilities;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class SplitManageCollectionsPermissions2 : Migration
|
||||
{
|
||||
public partial class SplitManageCollectionsPermissions2 : Migration
|
||||
private const string _scriptLocation =
|
||||
"MySqlMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.sql";
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
private const string _scriptLocation =
|
||||
"MySqlMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.sql";
|
||||
migrationBuilder.Sql(CoreHelpers.GetEmbeddedResourceContentsAsync(_scriptLocation));
|
||||
}
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.Sql(CoreHelpers.GetEmbeddedResourceContentsAsync(_scriptLocation));
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
throw new Exception("Irreversible migration");
|
||||
}
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
throw new Exception("Irreversible migration");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
using Bit.Core.Utilities;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class SetMaxAutoscaleSeatsToCurrentSeatCount : Migration
|
||||
{
|
||||
public partial class SetMaxAutoscaleSeatsToCurrentSeatCount : Migration
|
||||
private const string _scriptLocation =
|
||||
"MySqlMigrations.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.sql";
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
private const string _scriptLocation =
|
||||
"MySqlMigrations.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.sql";
|
||||
migrationBuilder.Sql(CoreHelpers.GetEmbeddedResourceContentsAsync(_scriptLocation));
|
||||
}
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.Sql(CoreHelpers.GetEmbeddedResourceContentsAsync(_scriptLocation));
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
throw new Exception("Irreversible migration");
|
||||
}
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
throw new Exception("Irreversible migration");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class KeyConnector : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UsesKeyConnector",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UsesKeyConnector",
|
||||
table: "User");
|
||||
}
|
||||
public partial class KeyConnector : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UsesKeyConnector",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UsesKeyConnector",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,85 +1,84 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class OrganizationSponsorship : Migration
|
||||
{
|
||||
public partial class OrganizationSponsorship : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UsesCryptoAgent",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UsesCryptoAgent",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationSponsorship",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
InstallationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoringOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoringOrganizationUserId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoredOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
FriendlyName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
OfferedToEmail = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
PlanSponsorshipType = table.Column<byte>(type: "tinyint unsigned", nullable: true),
|
||||
CloudSponsor = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||
LastSyncDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
|
||||
TimesRenewedWithoutValidation = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
SponsorshipLapsedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationSponsorship", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
column: x => x.InstallationId,
|
||||
principalTable: "Installation",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoredOrganizationId",
|
||||
column: x => x.SponsoredOrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
column: x => x.SponsoringOrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationSponsorship",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
InstallationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoringOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoringOrganizationUserId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
SponsoredOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
FriendlyName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
OfferedToEmail = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
PlanSponsorshipType = table.Column<byte>(type: "tinyint unsigned", nullable: true),
|
||||
CloudSponsor = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||
LastSyncDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
|
||||
TimesRenewedWithoutValidation = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
SponsorshipLapsedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationSponsorship", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
column: x => x.InstallationId,
|
||||
principalTable: "Installation",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoredOrganizationId",
|
||||
column: x => x.SponsoredOrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
column: x => x.SponsoringOrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId");
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_SponsoredOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoredOrganizationId");
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_SponsoredOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoredOrganizationId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId");
|
||||
}
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationSponsorship");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UsesCryptoAgent",
|
||||
table: "User");
|
||||
}
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UsesCryptoAgent",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class KeyConnectorFlag : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseKeyConnector",
|
||||
table: "Organization",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseKeyConnector",
|
||||
table: "Organization");
|
||||
}
|
||||
public partial class KeyConnectorFlag : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseKeyConnector",
|
||||
table: "Organization",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseKeyConnector",
|
||||
table: "Organization");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,51 +1,50 @@
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class RemoveU2F : Migration
|
||||
{
|
||||
public partial class RemoveU2F : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "U2f");
|
||||
}
|
||||
migrationBuilder.DropTable(
|
||||
name: "U2f");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "U2f",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
AppId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
Challenge = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreationDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
KeyHandle = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
UserId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Version = table.Column<string>(type: "varchar(20)", maxLength: 20, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_U2f", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_U2f_User_UserId",
|
||||
column: x => x.UserId,
|
||||
principalTable: "User",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "U2f",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
AppId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
Challenge = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreationDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
KeyHandle = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
UserId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Version = table.Column<string>(type: "varchar(20)", maxLength: 20, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_U2f", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_U2f_User_UserId",
|
||||
column: x => x.UserId,
|
||||
principalTable: "User",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_U2f_UserId",
|
||||
table: "U2f",
|
||||
column: "UserId");
|
||||
}
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_U2f_UserId",
|
||||
table: "U2f",
|
||||
column: "UserId");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,34 +1,33 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class FailedLoginCaptcha : Migration
|
||||
{
|
||||
public partial class FailedLoginCaptcha : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "FailedLoginCount",
|
||||
table: "User",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "FailedLoginCount",
|
||||
table: "User",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "LastFailedLoginDate",
|
||||
table: "User",
|
||||
type: "datetime(6)",
|
||||
nullable: true);
|
||||
}
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "LastFailedLoginDate",
|
||||
table: "User",
|
||||
type: "datetime(6)",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "FailedLoginCount",
|
||||
table: "User");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "FailedLoginCount",
|
||||
table: "User");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "LastFailedLoginDate",
|
||||
table: "User");
|
||||
}
|
||||
migrationBuilder.DropColumn(
|
||||
name: "LastFailedLoginDate",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,158 +1,157 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class SelfHostF4E : Migration
|
||||
{
|
||||
public partial class SelfHostF4E : Migration
|
||||
private const string _scriptLocationTemplate = "2022-03-01_00_{0}_MigrateOrganizationApiKeys.sql";
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
private const string _scriptLocationTemplate = "2022-03-01_00_{0}_MigrateOrganizationApiKeys.sql";
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InstallationId",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "TimesRenewedWithoutValidation",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "TimesRenewedWithoutValidation",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationApiKey",
|
||||
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"),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
ApiKey = table.Column<string>(type: "varchar(30)", maxLength: 30, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
RevisionDate = table.Column<DateTime>(type: "datetime(6)", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationApiKey", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationApiKey_Organization_OrganizationId",
|
||||
column: x => x.OrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationApiKey",
|
||||
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"),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
ApiKey = table.Column<string>(type: "varchar(30)", maxLength: 30, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
RevisionDate = table.Column<DateTime>(type: "datetime(6)", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationApiKey", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationApiKey_Organization_OrganizationId",
|
||||
column: x => x.OrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
migrationBuilder.SqlResource(_scriptLocationTemplate);
|
||||
|
||||
migrationBuilder.SqlResource(_scriptLocationTemplate);
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ApiKey",
|
||||
table: "Organization");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ApiKey",
|
||||
table: "Organization");
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "SponsorshipLapsedDate",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "ValidUntil");
|
||||
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "SponsorshipLapsedDate",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "ValidUntil");
|
||||
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "CloudSponsor",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "ToDelete");
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "CloudSponsor",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "ToDelete");
|
||||
|
||||
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationConnection",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
OrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Enabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||
Config = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationConnection", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationConnection_Organization_OrganizationId",
|
||||
column: x => x.OrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
migrationBuilder.CreateTable(
|
||||
name: "OrganizationConnection",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Type = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
OrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Enabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||
Config = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_OrganizationConnection", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_OrganizationConnection_Organization_OrganizationId",
|
||||
column: x => x.OrganizationId,
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationApiKey_OrganizationId",
|
||||
table: "OrganizationApiKey",
|
||||
column: "OrganizationId");
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationApiKey_OrganizationId",
|
||||
table: "OrganizationApiKey",
|
||||
column: "OrganizationId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationConnection_OrganizationId",
|
||||
table: "OrganizationConnection",
|
||||
column: "OrganizationId");
|
||||
}
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationConnection_OrganizationId",
|
||||
table: "OrganizationConnection",
|
||||
column: "OrganizationId");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "ApiKey",
|
||||
table: "Organization",
|
||||
type: "varchar(30)",
|
||||
maxLength: 30,
|
||||
nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "ApiKey",
|
||||
table: "Organization",
|
||||
type: "varchar(30)",
|
||||
maxLength: 30,
|
||||
nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.SqlResource(_scriptLocationTemplate);
|
||||
migrationBuilder.SqlResource(_scriptLocationTemplate);
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationApiKey");
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationApiKey");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationConnection");
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationConnection");
|
||||
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "ValidUntil",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "SponsorshipLapsedDate");
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "ValidUntil",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "SponsorshipLapsedDate");
|
||||
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "ToDelete",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "CloudSponsor");
|
||||
migrationBuilder.RenameColumn(
|
||||
name: "ToDelete",
|
||||
table: "OrganizationSponsorship",
|
||||
newName: "CloudSponsor");
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<byte>(
|
||||
name: "TimesRenewedWithoutValidation",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "tinyint unsigned",
|
||||
nullable: false,
|
||||
defaultValue: (byte)0);
|
||||
migrationBuilder.AddColumn<byte>(
|
||||
name: "TimesRenewedWithoutValidation",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "tinyint unsigned",
|
||||
nullable: false,
|
||||
defaultValue: (byte)0);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId");
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_OrganizationSponsorship_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId",
|
||||
principalTable: "Installation",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Installation_InstallationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "InstallationId",
|
||||
principalTable: "Installation",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,81 +1,80 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class SponsorshipBulkActions : Migration
|
||||
{
|
||||
public partial class SponsorshipBulkActions : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationUserId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationUserId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
}
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationUserId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationUserId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,70 +1,69 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
public partial class AddInstallationIdToEvents : Migration
|
||||
{
|
||||
public partial class AddInstallationIdToEvents : Migration
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "InstallationId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "InstallationId",
|
||||
table: "Event",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InstallationId",
|
||||
table: "Event");
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InstallationId",
|
||||
table: "Event");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
type: "char(36)",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
}
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_OrganizationSponsorship_Organization_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId",
|
||||
principalTable: "Organization",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class DeviceUnknownVerification : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UnknownDeviceVerificationEnabled",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: true);
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UnknownDeviceVerificationEnabled",
|
||||
table: "User");
|
||||
}
|
||||
public partial class DeviceUnknownVerification : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UnknownDeviceVerificationEnabled",
|
||||
table: "User",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: true);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UnknownDeviceVerificationEnabled",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,29 +1,28 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class DeactivatedUserStatus : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<short>(
|
||||
name: "Status",
|
||||
table: "OrganizationUser",
|
||||
type: "smallint",
|
||||
nullable: false,
|
||||
oldClrType: typeof(byte),
|
||||
oldType: "tinyint unsigned");
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<byte>(
|
||||
name: "Status",
|
||||
table: "OrganizationUser",
|
||||
type: "tinyint unsigned",
|
||||
nullable: false,
|
||||
oldClrType: typeof(short),
|
||||
oldType: "smallint");
|
||||
}
|
||||
public partial class DeactivatedUserStatus : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<short>(
|
||||
name: "Status",
|
||||
table: "OrganizationUser",
|
||||
type: "smallint",
|
||||
nullable: false,
|
||||
oldClrType: typeof(byte),
|
||||
oldType: "tinyint unsigned");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<byte>(
|
||||
name: "Status",
|
||||
table: "OrganizationUser",
|
||||
type: "tinyint unsigned",
|
||||
nullable: false,
|
||||
oldClrType: typeof(short),
|
||||
oldType: "smallint");
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,25 +2,24 @@
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class UseScimFlag : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseScim",
|
||||
table: "Organization",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseScim",
|
||||
table: "Organization");
|
||||
}
|
||||
public partial class UseScimFlag : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "UseScim",
|
||||
table: "Organization",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UseScim",
|
||||
table: "Organization");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user