From 4a828ad440613ac446d51883146582e01d31db73 Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Thu, 8 Jul 2021 15:46:13 -0400 Subject: [PATCH] Migration Fix (#1448) * created stubs for missing ef provider methods * fixed the initial postgres migration --- .../ProviderOrganizationRepository.cs | 5 + .../EntityFramework/ProviderUserRepository.cs | 5 + util/MySqlMigrations/Factories.cs | 41 +- util/PostgresMigrations/Factories.cs | 40 +- ...ner.cs => 20210708191531_Init.Designer.cs} | 9 +- ...ostgres_Init.cs => 20210708191531_Init.cs} | 5 +- .../DatabaseContextModelSnapshot.cs | 550 +++++++++--------- util/PostgresMigrations/Scripts/Init.psql | 7 +- 8 files changed, 318 insertions(+), 344 deletions(-) rename util/PostgresMigrations/Migrations/{20210617163014_Postgres_Init.Designer.cs => 20210708191531_Init.Designer.cs} (99%) rename util/PostgresMigrations/Migrations/{20210617163014_Postgres_Init.cs => 20210708191531_Init.cs} (99%) diff --git a/src/Core/Repositories/EntityFramework/ProviderOrganizationRepository.cs b/src/Core/Repositories/EntityFramework/ProviderOrganizationRepository.cs index 6bce3cc190..814fbb891f 100644 --- a/src/Core/Repositories/EntityFramework/ProviderOrganizationRepository.cs +++ b/src/Core/Repositories/EntityFramework/ProviderOrganizationRepository.cs @@ -20,6 +20,11 @@ namespace Bit.Core.Repositories.EntityFramework : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.ProviderOrganizations) { } + public Task> GetManyByUserIdAsync(Guid userId) + { + throw new NotImplementedException(); + } + public async Task> GetManyDetailsByProviderAsync(Guid providerId) { using (var scope = ServiceScopeFactory.CreateScope()) diff --git a/src/Core/Repositories/EntityFramework/ProviderUserRepository.cs b/src/Core/Repositories/EntityFramework/ProviderUserRepository.cs index 67c642b3c0..40f100a33c 100644 --- a/src/Core/Repositories/EntityFramework/ProviderUserRepository.cs +++ b/src/Core/Repositories/EntityFramework/ProviderUserRepository.cs @@ -140,5 +140,10 @@ namespace Bit.Core.Repositories.EntityFramework return data; } } + + public Task> GetManyOrganizationDetailsByUserAsync(Guid userId, ProviderUserStatusType? status = null) + { + throw new NotImplementedException(); + } } } diff --git a/util/MySqlMigrations/Factories.cs b/util/MySqlMigrations/Factories.cs index 1fad15f524..2077c9fb0a 100644 --- a/util/MySqlMigrations/Factories.cs +++ b/util/MySqlMigrations/Factories.cs @@ -26,42 +26,15 @@ namespace MySqlMigrations { var globalSettings = GlobalSettingsFactory.GlobalSettings; var optionsBuilder = new DbContextOptionsBuilder(); - - var selectedDatabaseProvider = globalSettings.DatabaseProvider; - var provider = SupportedDatabaseProviders.Postgres; - var connectionString = string.Empty; - if (!string.IsNullOrWhiteSpace(selectedDatabaseProvider)) + var connectionString = globalSettings.MySql?.ConnectionString; + if (string.IsNullOrWhiteSpace(connectionString)) { - switch (selectedDatabaseProvider.ToLowerInvariant()) - { - case "postgres": - case "postgresql": - provider = SupportedDatabaseProviders.Postgres; - connectionString = globalSettings.PostgreSql.ConnectionString; - break; - case "mysql": - case "mariadb": - provider = SupportedDatabaseProviders.MySql; - connectionString = globalSettings.MySql.ConnectionString; - break; - default: - throw new Exception("No database provider selected"); - break; - } - } - if (provider.Equals(SupportedDatabaseProviders.Postgres)) - { - optionsBuilder.UseNpgsql( - connectionString, - b => b.MigrationsAssembly("PostgresMigrations")); - } - else if (provider.Equals(SupportedDatabaseProviders.MySql)) - { - optionsBuilder.UseMySql( - connectionString, - ServerVersion.AutoDetect(connectionString), - b => b.MigrationsAssembly("MySqlMigrations")); + throw new Exception("No MySql connection string found."); } + optionsBuilder.UseMySql( + connectionString, + ServerVersion.AutoDetect(connectionString), + b => b.MigrationsAssembly("MySqlMigrations")); return new DatabaseContext(optionsBuilder.Options); } } diff --git a/util/PostgresMigrations/Factories.cs b/util/PostgresMigrations/Factories.cs index 1fad15f524..39e2fbe229 100644 --- a/util/PostgresMigrations/Factories.cs +++ b/util/PostgresMigrations/Factories.cs @@ -26,42 +26,14 @@ namespace MySqlMigrations { var globalSettings = GlobalSettingsFactory.GlobalSettings; var optionsBuilder = new DbContextOptionsBuilder(); - - var selectedDatabaseProvider = globalSettings.DatabaseProvider; - var provider = SupportedDatabaseProviders.Postgres; - var connectionString = string.Empty; - if (!string.IsNullOrWhiteSpace(selectedDatabaseProvider)) + var connectionString = globalSettings.PostgreSql?.ConnectionString; + if (string.IsNullOrWhiteSpace(connectionString)) { - switch (selectedDatabaseProvider.ToLowerInvariant()) - { - case "postgres": - case "postgresql": - provider = SupportedDatabaseProviders.Postgres; - connectionString = globalSettings.PostgreSql.ConnectionString; - break; - case "mysql": - case "mariadb": - provider = SupportedDatabaseProviders.MySql; - connectionString = globalSettings.MySql.ConnectionString; - break; - default: - throw new Exception("No database provider selected"); - break; - } - } - if (provider.Equals(SupportedDatabaseProviders.Postgres)) - { - optionsBuilder.UseNpgsql( - connectionString, - b => b.MigrationsAssembly("PostgresMigrations")); - } - else if (provider.Equals(SupportedDatabaseProviders.MySql)) - { - optionsBuilder.UseMySql( - connectionString, - ServerVersion.AutoDetect(connectionString), - b => b.MigrationsAssembly("MySqlMigrations")); + throw new Exception("No Postgres connection string found."); } + optionsBuilder.UseNpgsql( + connectionString, + b => b.MigrationsAssembly("PostgresMigrations")); return new DatabaseContext(optionsBuilder.Options); } } diff --git a/util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.Designer.cs b/util/PostgresMigrations/Migrations/20210708191531_Init.Designer.cs similarity index 99% rename from util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.Designer.cs rename to util/PostgresMigrations/Migrations/20210708191531_Init.Designer.cs index 1cdd6c9bd3..abec18b659 100644 --- a/util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.Designer.cs +++ b/util/PostgresMigrations/Migrations/20210708191531_Init.Designer.cs @@ -7,11 +7,11 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -namespace Bit.EntityFrameworkMigrations.Migrations +namespace Bit.PostgresMigrations.Migrations { [DbContext(typeof(DatabaseContext))] - [Migration("20210617163014_Postgres_Init")] - partial class Postgres_Init + [Migration("20210708191531_Init")] + partial class Init { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -699,6 +699,9 @@ namespace Bit.EntityFrameworkMigrations.Migrations b.Property("Status") .HasColumnType("smallint"); + b.Property("UseEvents") + .HasColumnType("boolean"); + b.HasKey("Id"); b.ToTable("Provider"); diff --git a/util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.cs b/util/PostgresMigrations/Migrations/20210708191531_Init.cs similarity index 99% rename from util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.cs rename to util/PostgresMigrations/Migrations/20210708191531_Init.cs index 1f0344dcb7..7eaa32a5a7 100644 --- a/util/PostgresMigrations/Migrations/20210617163014_Postgres_Init.cs +++ b/util/PostgresMigrations/Migrations/20210708191531_Init.cs @@ -2,9 +2,9 @@ using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -namespace Bit.EntityFrameworkMigrations.Migrations +namespace Bit.PostgresMigrations.Migrations { - public partial class Postgres_Init : Migration + public partial class Init : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -133,6 +133,7 @@ namespace Bit.EntityFrameworkMigrations.Migrations BusinessTaxNumber = table.Column(type: "text", nullable: true), BillingEmail = table.Column(type: "text", nullable: true), Status = table.Column(type: "smallint", nullable: false), + UseEvents = table.Column(type: "boolean", nullable: false), Enabled = table.Column(type: "boolean", nullable: false), CreationDate = table.Column(type: "timestamp without time zone", nullable: false), RevisionDate = table.Column(type: "timestamp without time zone", nullable: false) diff --git a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs index 74399182ab..8e81d55fdd 100644 --- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -4,8 +4,9 @@ using Bit.Core.Repositories.EntityFramework; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -namespace Bit.EntityFrameworkMigrations.Migrations +namespace Bit.PostgresMigrations.Migrations { [DbContext(typeof(DatabaseContext))] partial class DatabaseContextModelSnapshot : ModelSnapshot @@ -14,46 +15,48 @@ namespace Bit.EntityFrameworkMigrations.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("Relational:MaxIdentifierLength", 64) - .HasAnnotation("ProductVersion", "5.0.5"); + .HasAnnotation("Npgsql:CollationDefinition:postgresIndetermanisticCollation", "en-u-ks-primary,en-u-ks-primary,icu,False") + .HasAnnotation("Relational:MaxIdentifierLength", 63) + .HasAnnotation("ProductVersion", "5.0.5") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); modelBuilder.Entity("Bit.Core.Models.EntityFramework.Cipher", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Attachments") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Data") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("DeletedDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Favorites") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Folders") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Reprompt") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -67,23 +70,23 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Collection", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("ExternalId") .HasMaxLength(300) - .HasColumnType("varchar(300)"); + .HasColumnType("character varying(300)"); b.Property("Name") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.HasKey("Id"); @@ -95,10 +98,10 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.CollectionCipher", b => { b.Property("CollectionId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CipherId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("CollectionId", "CipherId"); @@ -110,16 +113,16 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.CollectionGroup", b => { b.Property("CollectionId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("GroupId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("HidePasswords") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("ReadOnly") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.HasKey("CollectionId", "GroupId"); @@ -131,19 +134,19 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.CollectionUser", b => { b.Property("CollectionId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("OrganizationUserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("HidePasswords") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("ReadOnly") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("CollectionId", "OrganizationUserId"); @@ -158,31 +161,31 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Identifier") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Name") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("PushToken") .HasMaxLength(255) - .HasColumnType("varchar(255)"); + .HasColumnType("character varying(255)"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -194,41 +197,41 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.EmergencyAccess", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Email") .HasMaxLength(256) - .HasColumnType("varchar(256)"); + .HasColumnType("character varying(256)"); b.Property("GranteeId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("GrantorId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("KeyEncrypted") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("LastNotificationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("RecoveryInitiatedDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Status") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("WaitTimeDays") - .HasColumnType("int"); + .HasColumnType("integer"); b.HasKey("Id"); @@ -242,44 +245,44 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Event", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("ActingUserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CipherId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CollectionId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Date") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("DeviceType") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("GroupId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("IpAddress") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("OrganizationUserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("PolicyId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Type") - .HasColumnType("int"); + .HasColumnType("integer"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -289,19 +292,19 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Folder", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Name") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -314,39 +317,39 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Key") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("ClientId") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("ConsumedDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Data") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Description") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("ExpirationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("SessionId") .HasMaxLength(100) - .HasColumnType("varchar(100)"); + .HasColumnType("character varying(100)"); b.Property("SubjectId") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("Type") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.HasKey("Key"); @@ -356,27 +359,27 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Group", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("AccessAll") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("ExternalId") .HasMaxLength(300) - .HasColumnType("varchar(300)"); + .HasColumnType("character varying(300)"); b.Property("Name") .HasMaxLength(100) - .HasColumnType("varchar(100)"); + .HasColumnType("character varying(100)"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.HasKey("Id"); @@ -388,13 +391,13 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.GroupUser", b => { b.Property("GroupId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("OrganizationUserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("GroupId", "OrganizationUserId"); @@ -408,21 +411,21 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Installation", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Email") .HasMaxLength(256) - .HasColumnType("varchar(256)"); + .HasColumnType("character varying(256)"); b.Property("Enabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("Key") .HasMaxLength(150) - .HasColumnType("varchar(150)"); + .HasColumnType("character varying(150)"); b.HasKey("Id"); @@ -432,67 +435,68 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Organization", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("ApiKey") .HasMaxLength(30) - .HasColumnType("varchar(30)"); + .HasColumnType("character varying(30)"); b.Property("BillingEmail") .HasMaxLength(256) - .HasColumnType("varchar(256)"); + .HasColumnType("character varying(256)"); b.Property("BusinessAddress1") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("BusinessAddress2") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("BusinessAddress3") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("BusinessCountry") .HasMaxLength(2) - .HasColumnType("varchar(2)"); + .HasColumnType("character varying(2)"); b.Property("BusinessName") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("BusinessTaxNumber") .HasMaxLength(30) - .HasColumnType("varchar(30)"); + .HasColumnType("character varying(30)"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Enabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("ExpirationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Gateway") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("GatewayCustomerId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("GatewaySubscriptionId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Identifier") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)") + .UseCollation("postgresIndetermanisticCollation"); b.Property("LicenseKey") .HasMaxLength(100) - .HasColumnType("varchar(100)"); + .HasColumnType("character varying(100)"); b.Property("MaxCollections") .HasColumnType("smallint"); @@ -502,68 +506,68 @@ namespace Bit.EntityFrameworkMigrations.Migrations b.Property("Name") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Plan") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("PlanType") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("PrivateKey") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("PublicKey") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ReferenceData") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Seats") - .HasColumnType("int"); + .HasColumnType("integer"); b.Property("SelfHost") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("Storage") .HasColumnType("bigint"); b.Property("TwoFactorProviders") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Use2fa") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseApi") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseDirectory") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseEvents") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseGroups") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UsePolicies") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseResetPassword") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseSso") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UseTotp") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("UsersGetPremium") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.HasKey("Id"); @@ -573,45 +577,45 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.OrganizationUser", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("AccessAll") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Email") .HasMaxLength(256) - .HasColumnType("varchar(256)"); + .HasColumnType("character varying(256)"); b.Property("ExternalId") .HasMaxLength(300) - .HasColumnType("varchar(300)"); + .HasColumnType("character varying(300)"); b.Property("Key") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Permissions") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ResetPasswordKey") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Status") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -625,25 +629,25 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Policy", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Data") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Enabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.HasKey("Id"); @@ -655,43 +659,46 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Provider.Provider", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("BillingEmail") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessAddress1") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessAddress2") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessAddress3") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessCountry") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessName") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("BusinessTaxNumber") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Enabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("Name") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Status") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); + + b.Property("UseEvents") + .HasColumnType("boolean"); b.HasKey("Id"); @@ -701,25 +708,25 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Provider.ProviderOrganization", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Key") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("ProviderId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Settings") - .HasColumnType("longtext"); + .HasColumnType("text"); b.HasKey("Id"); @@ -733,25 +740,25 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Provider.ProviderOrganizationProviderUser", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Permissions") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ProviderOrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("ProviderUserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.HasKey("Id"); @@ -765,34 +772,34 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Provider.ProviderUser", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Email") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Key") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Permissions") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ProviderId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Status") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -806,50 +813,50 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Send", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("AccessCount") - .HasColumnType("int"); + .HasColumnType("integer"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Data") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("DeletionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Disabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("ExpirationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("HideEmail") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("Key") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("MaxAccessCount") - .HasColumnType("int"); + .HasColumnType("integer"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Password") .HasMaxLength(300) - .HasColumnType("varchar(300)"); + .HasColumnType("character varying(300)"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -864,22 +871,23 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnType("bigint"); + .HasColumnType("bigint") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Data") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Enabled") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.HasKey("Id"); @@ -892,20 +900,22 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnType("bigint"); + .HasColumnType("bigint") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("ExternalId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)") + .UseCollation("postgresIndetermanisticCollation"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -920,25 +930,25 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Id") .HasMaxLength(40) - .HasColumnType("varchar(40)"); + .HasColumnType("character varying(40)"); b.Property("Active") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("Country") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("PostalCode") .HasMaxLength(10) - .HasColumnType("varchar(10)"); + .HasColumnType("character varying(10)"); b.Property("Rate") - .HasColumnType("decimal(65,30)"); + .HasColumnType("numeric"); b.Property("State") .HasMaxLength(2) - .HasColumnType("varchar(2)"); + .HasColumnType("character varying(2)"); b.HasKey("Id"); @@ -948,42 +958,42 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.Transaction", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Amount") - .HasColumnType("decimal(65,30)"); + .HasColumnType("numeric"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Details") .HasMaxLength(100) - .HasColumnType("varchar(100)"); + .HasColumnType("character varying(100)"); b.Property("Gateway") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("GatewayId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("OrganizationId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("PaymentMethodType") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("Refunded") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("RefundedAmount") - .HasColumnType("decimal(65,30)"); + .HasColumnType("numeric"); b.Property("Type") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.HasKey("Id"); @@ -998,29 +1008,30 @@ namespace Bit.EntityFrameworkMigrations.Migrations { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnType("int"); + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); b.Property("AppId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Challenge") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("KeyHandle") .HasMaxLength(200) - .HasColumnType("varchar(200)"); + .HasColumnType("character varying(200)"); b.Property("UserId") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("Version") .HasMaxLength(20) - .HasColumnType("varchar(20)"); + .HasColumnType("character varying(20)"); b.HasKey("Id"); @@ -1032,111 +1043,112 @@ namespace Bit.EntityFrameworkMigrations.Migrations modelBuilder.Entity("Bit.Core.Models.EntityFramework.User", b => { b.Property("Id") - .HasColumnType("char(36)"); + .HasColumnType("uuid"); b.Property("AccountRevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("ApiKey") .IsRequired() .HasMaxLength(30) - .HasColumnType("varchar(30)"); + .HasColumnType("character varying(30)"); b.Property("CreationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("Culture") .HasMaxLength(10) - .HasColumnType("varchar(10)"); + .HasColumnType("character varying(10)"); b.Property("Email") .IsRequired() .HasMaxLength(256) - .HasColumnType("varchar(256)"); + .HasColumnType("character varying(256)") + .UseCollation("postgresIndetermanisticCollation"); b.Property("EmailVerified") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("EquivalentDomains") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ExcludedGlobalEquivalentDomains") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("Gateway") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("GatewayCustomerId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("GatewaySubscriptionId") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Kdf") - .HasColumnType("tinyint unsigned"); + .HasColumnType("smallint"); b.Property("KdfIterations") - .HasColumnType("int"); + .HasColumnType("integer"); b.Property("Key") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("LicenseKey") .HasMaxLength(100) - .HasColumnType("varchar(100)"); + .HasColumnType("character varying(100)"); b.Property("MasterPassword") .HasMaxLength(300) - .HasColumnType("varchar(300)"); + .HasColumnType("character varying(300)"); b.Property("MasterPasswordHint") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("MaxStorageGb") .HasColumnType("smallint"); b.Property("Name") .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Premium") - .HasColumnType("tinyint(1)"); + .HasColumnType("boolean"); b.Property("PremiumExpirationDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("PrivateKey") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("PublicKey") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("ReferenceData") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("RenewalReminderDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("RevisionDate") - .HasColumnType("datetime(6)"); + .HasColumnType("timestamp without time zone"); b.Property("SecurityStamp") .IsRequired() .HasMaxLength(50) - .HasColumnType("varchar(50)"); + .HasColumnType("character varying(50)"); b.Property("Storage") .HasColumnType("bigint"); b.Property("TwoFactorProviders") - .HasColumnType("longtext"); + .HasColumnType("text"); b.Property("TwoFactorRecoveryCode") .HasMaxLength(32) - .HasColumnType("varchar(32)"); + .HasColumnType("character varying(32)"); b.HasKey("Id"); diff --git a/util/PostgresMigrations/Scripts/Init.psql b/util/PostgresMigrations/Scripts/Init.psql index 4ad6012448..31dc516614 100644 --- a/util/PostgresMigrations/Scripts/Init.psql +++ b/util/PostgresMigrations/Scripts/Init.psql @@ -107,6 +107,7 @@ CREATE TABLE "Provider" ( "BusinessTaxNumber" text NULL, "BillingEmail" text NULL, "Status" smallint NOT NULL, + "UseEvents" boolean NOT NULL, "Enabled" boolean NOT NULL, "CreationDate" timestamp without time zone NOT NULL, "RevisionDate" timestamp without time zone NOT NULL, @@ -489,6 +490,8 @@ CREATE INDEX "IX_Transaction_UserId" ON "Transaction" ("UserId"); CREATE INDEX "IX_U2f_UserId" ON "U2f" ("UserId"); INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion") -VALUES ('20210617163014_Postgres_Init', '5.0.5'); +VALUES ('20210708191531_Init', '5.0.5'); + +COMMIT; + -COMMIT; \ No newline at end of file