mirror of
https://github.com/bitwarden/server.git
synced 2025-07-04 09:32:48 -05:00
Initial db work (#1687)
* Add organization sponsorship databases to all providers * Generalize create and update for database, specialize in code
This commit is contained in:
Matt Gibson
1562
util/MySqlMigrations/Migrations/20211102213543_OrganizationSponsorship.Designer.cs
generated
Normal file
1562
util/MySqlMigrations/Migrations/20211102213543_OrganizationSponsorship.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,83 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
public partial class OrganizationSponsorship : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
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: false, collation: "ascii_general_ci"),
|
||||
SponsoringOrganizationUserId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
SponsoredOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
OfferedToEmail = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
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.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
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_SponsoringOrganizationId",
|
||||
table: "OrganizationSponsorship",
|
||||
column: "SponsoringOrganizationId");
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "OrganizationSponsorship");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UsesCryptoAgent",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -585,6 +585,50 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.ToTable("Organization");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Core.Models.EntityFramework.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<bool>("CloudSponsor")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<Guid?>("InstallationId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<DateTime?>("LastSyncDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.Property<string>("OfferedToEmail")
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("varchar(256)");
|
||||
|
||||
b.Property<Guid?>("SponsoredOrganizationId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid>("SponsoringOrganizationId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid>("SponsoringOrganizationUserId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<DateTime?>("SponsorshipLapsedDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.Property<byte>("TimesRenewedWithoutValidation")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("InstallationId");
|
||||
|
||||
b.HasIndex("SponsoredOrganizationId");
|
||||
|
||||
b.HasIndex("SponsoringOrganizationId");
|
||||
|
||||
b.ToTable("OrganizationSponsorship");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Core.Models.EntityFramework.OrganizationUser", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1127,6 +1171,9 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
.HasMaxLength(32)
|
||||
.HasColumnType("varchar(32)");
|
||||
|
||||
b.Property<bool>("UsesCryptoAgent")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("User");
|
||||
@ -1292,6 +1339,29 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Navigation("OrganizationUser");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Core.Models.EntityFramework.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.HasOne("Bit.Core.Models.EntityFramework.Installation", "Installation")
|
||||
.WithMany()
|
||||
.HasForeignKey("InstallationId");
|
||||
|
||||
b.HasOne("Bit.Core.Models.EntityFramework.Organization", "SponsoredOrganization")
|
||||
.WithMany()
|
||||
.HasForeignKey("SponsoredOrganizationId");
|
||||
|
||||
b.HasOne("Bit.Core.Models.EntityFramework.Organization", "SponsoringOrganization")
|
||||
.WithMany()
|
||||
.HasForeignKey("SponsoringOrganizationId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Installation");
|
||||
|
||||
b.Navigation("SponsoredOrganization");
|
||||
|
||||
b.Navigation("SponsoringOrganization");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Core.Models.EntityFramework.OrganizationUser", b =>
|
||||
{
|
||||
b.HasOne("Bit.Core.Models.EntityFramework.Organization", "Organization")
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
START TRANSACTION;
|
||||
|
||||
ALTER TABLE `User` ADD `UsesCryptoAgent` tinyint(1) NOT NULL DEFAULT FALSE;
|
||||
|
||||
CREATE TABLE `OrganizationSponsorship` (
|
||||
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
|
||||
`InstallationId` char(36) COLLATE ascii_general_ci NULL,
|
||||
`SponsoringOrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
|
||||
`SponsoringOrganizationUserId` char(36) COLLATE ascii_general_ci NOT NULL,
|
||||
`SponsoredOrganizationId` char(36) COLLATE ascii_general_ci NULL,
|
||||
`OfferedToEmail` varchar(256) CHARACTER SET utf8mb4 NULL,
|
||||
`CloudSponsor` tinyint(1) NOT NULL,
|
||||
`LastSyncDate` datetime(6) NULL,
|
||||
`TimesRenewedWithoutValidation` tinyint unsigned NOT NULL,
|
||||
`SponsorshipLapsedDate` datetime(6) NULL,
|
||||
CONSTRAINT `PK_OrganizationSponsorship` PRIMARY KEY (`Id`),
|
||||
CONSTRAINT `FK_OrganizationSponsorship_Installation_InstallationId` FOREIGN KEY (`InstallationId`) REFERENCES `Installation` (`Id`) ON DELETE RESTRICT,
|
||||
CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoredOrganizationId` FOREIGN KEY (`SponsoredOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
|
||||
CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId` FOREIGN KEY (`SponsoringOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
|
||||
) CHARACTER SET utf8mb4;
|
||||
|
||||
CREATE INDEX `IX_OrganizationSponsorship_InstallationId` ON `OrganizationSponsorship` (`InstallationId`);
|
||||
|
||||
CREATE INDEX `IX_OrganizationSponsorship_SponsoredOrganizationId` ON `OrganizationSponsorship` (`SponsoredOrganizationId`);
|
||||
|
||||
CREATE INDEX `IX_OrganizationSponsorship_SponsoringOrganizationId` ON `OrganizationSponsorship` (`SponsoringOrganizationId`);
|
||||
|
||||
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
|
||||
VALUES ('20211102213543_OrganizationSponsorship', '5.0.9');
|
||||
|
||||
COMMIT;
|
||||
Reference in New Issue
Block a user