diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.Designer.cs b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.Designer.cs similarity index 98% rename from modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.Designer.cs rename to modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.Designer.cs index 158f345fbe..f829ae69d7 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.Designer.cs +++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace OpenIddict.Demo.Server.Migrations { [DbContext(typeof(ServerDbContext))] - [Migration("20240829013142_Initial")] + [Migration("20241016024422_Initial")] partial class Initial { /// @@ -22,7 +22,7 @@ namespace OpenIddict.Demo.Server.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "8.0.4") + .HasAnnotation("ProductVersion", "9.0.0-rc.2.24474.1") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -403,9 +403,13 @@ namespace OpenIddict.Demo.Server.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + b.Property("IpAddresses") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); b.Property("LastAccessed") .HasColumnType("datetime2"); @@ -1541,18 +1545,21 @@ namespace OpenIddict.Demo.Server.Migrations { b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) .WithMany() - .HasForeignKey("ApplicationId"); + .HasForeignKey("ApplicationId") + .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Volo.Abp.OpenIddict.Tokens.OpenIddictToken", b => { b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) .WithMany() - .HasForeignKey("ApplicationId"); + .HasForeignKey("ApplicationId") + .OnDelete(DeleteBehavior.Cascade); b.HasOne("Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", null) .WithMany() - .HasForeignKey("AuthorizationId"); + .HasForeignKey("AuthorizationId") + .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.cs b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.cs similarity index 99% rename from modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.cs rename to modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.cs index 537745685f..bf4af9d947 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20240829013142_Initial.cs +++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20241016024422_Initial.cs @@ -232,9 +232,10 @@ namespace OpenIddict.Demo.Server.Migrations TenantId = table.Column(type: "uniqueidentifier", nullable: true), UserId = table.Column(type: "uniqueidentifier", nullable: false), ClientId = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - IpAddresses = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), + IpAddresses = table.Column(type: "nvarchar(2048)", maxLength: 2048, nullable: true), SignedIn = table.Column(type: "datetime2", nullable: false), - LastAccessed = table.Column(type: "datetime2", nullable: true) + LastAccessed = table.Column(type: "datetime2", nullable: true), + ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -623,7 +624,8 @@ namespace OpenIddict.Demo.Server.Migrations name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId", column: x => x.ApplicationId, principalTable: "OpenIddictApplications", - principalColumn: "Id"); + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( @@ -652,12 +654,14 @@ namespace OpenIddict.Demo.Server.Migrations name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId", column: x => x.ApplicationId, principalTable: "OpenIddictApplications", - principalColumn: "Id"); + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); table.ForeignKey( name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId", column: x => x.AuthorizationId, principalTable: "OpenIddictAuthorizations", - principalColumn: "Id"); + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateIndex( diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs index bdbb1fca9b..cb3d77323e 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs +++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace OpenIddict.Demo.Server.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "8.0.4") + .HasAnnotation("ProductVersion", "9.0.0-rc.2.24474.1") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -400,9 +400,13 @@ namespace OpenIddict.Demo.Server.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + b.Property("IpAddresses") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); b.Property("LastAccessed") .HasColumnType("datetime2"); @@ -1538,18 +1542,21 @@ namespace OpenIddict.Demo.Server.Migrations { b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) .WithMany() - .HasForeignKey("ApplicationId"); + .HasForeignKey("ApplicationId") + .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Volo.Abp.OpenIddict.Tokens.OpenIddictToken", b => { b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) .WithMany() - .HasForeignKey("ApplicationId"); + .HasForeignKey("ApplicationId") + .OnDelete(DeleteBehavior.Cascade); b.HasOne("Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", null) .WithMany() - .HasForeignKey("AuthorizationId"); + .HasForeignKey("AuthorizationId") + .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictDbContextModelCreatingExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictDbContextModelCreatingExtensions.cs index d10ecc86ae..f184c9b7e9 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictDbContextModelCreatingExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictDbContextModelCreatingExtensions.cs @@ -40,6 +40,9 @@ public static class OpenIddictDbContextModelCreatingExtensions b.Property(x => x.ClientType) .HasMaxLength(OpenIddictApplicationConsts.ClientTypeMaxLength); + b.HasMany().WithOne().HasForeignKey(x => x.ApplicationId).IsRequired(false).OnDelete(DeleteBehavior.Cascade); + b.HasMany().WithOne().HasForeignKey(x => x.ApplicationId).IsRequired(false).OnDelete(DeleteBehavior.Cascade); + b.ApplyObjectExtensionMappings(); }); @@ -66,7 +69,7 @@ public static class OpenIddictDbContextModelCreatingExtensions b.Property(x => x.Type) .HasMaxLength(OpenIddictAuthorizationConsts.TypeMaxLength); - b.HasOne().WithMany().HasForeignKey(x => x.ApplicationId).IsRequired(false); + b.HasMany().WithOne().HasForeignKey(x => x.AuthorizationId).IsRequired(false).OnDelete(DeleteBehavior.Cascade); b.ApplyObjectExtensionMappings(); }); @@ -115,8 +118,6 @@ public static class OpenIddictDbContextModelCreatingExtensions b.Property(x => x.Type) .HasMaxLength(OpenIddictTokenConsts.TypeMaxLength); - b.HasOne().WithMany().HasForeignKey(x => x.ApplicationId).IsRequired(false); - b.HasOne().WithMany().HasForeignKey(x => x.AuthorizationId).IsRequired(false); b.ApplyObjectExtensionMappings(); });