Skip to content

Commit 298d2f9

Browse files
committed
Make it work on MySQL Again
1 parent d72002e commit 298d2f9

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

Directory.Packages.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</ItemGroup>
99
<ItemGroup Label="Infrastructure">
1010
<PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
11-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0-rc.2.24474.1" />
12-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-rc.2.24474.1" />
13-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-rc.2.24474.1" />
11+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
12+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
1414
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.0-rc.2.24474.3" />
1515
<PackageVersion Include="MongoDB.Driver" Version="2.30.0" />
16-
<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.0-preview" />
16+
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
1717
<PackageVersion Include="RavenDB.Client" Version="6.2.1" />
1818
</ItemGroup>
1919
<ItemGroup Label="Web">
@@ -38,7 +38,7 @@
3838
<PackageVersion Include="bunit.generators" Version="2.0.24-preview" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3939
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4040
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
41-
<PackageVersion Include="xunit.v3" Version="0.5.0-pre.27" />
42-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.42" />
41+
<PackageVersion Include="xunit.v3" Version="0.6.0-pre.7" />
42+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
4343
</ItemGroup>
44-
</Project>
44+
</Project>

src/LinkDotNet.Blog.Infrastructure/LinkDotNet.Blog.Infrastructure.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
1414
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
1515
<PackageReference Include="MongoDB.Driver" />
16-
<PackageReference Include="MySql.EntityFrameworkCore" />
16+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
1717
<PackageReference Include="RavenDB.Client" />
1818
</ItemGroup>
1919

src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/BlogDbContext.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
3333
{
3434
ArgumentNullException.ThrowIfNull(modelBuilder);
3535

36-
modelBuilder.ApplyConfiguration(new BlogPostConfiguration(Database));
36+
modelBuilder.ApplyConfiguration(new BlogPostConfiguration());
3737
modelBuilder.ApplyConfiguration(new BlogPostRecordConfiguration());
3838
modelBuilder.ApplyConfiguration(new ProfileInformationEntryConfiguration());
3939
modelBuilder.ApplyConfiguration(new ShortCodeConfiguration());
40-
modelBuilder.ApplyConfiguration(new SimilarBlogPostConfiguration(Database));
40+
modelBuilder.ApplyConfiguration(new SimilarBlogPostConfiguration());
4141
modelBuilder.ApplyConfiguration(new SkillConfiguration());
4242
modelBuilder.ApplyConfiguration(new TalkConfiguration());
4343
modelBuilder.ApplyConfiguration(new UserRecordConfiguration());

src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/BlogPostConfiguration.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public void Configure(EntityTypeBuilder<BlogPost> builder)
1919
builder.Property(x => x.ShortDescription).IsRequired();
2020
builder.Property(x => x.Likes).IsRequired();
2121
builder.Property(x => x.IsPublished).IsRequired();
22-
builder.Property(x => x.Tags).HasMaxLength(2096);
22+
23+
builder.Property(x => x.Tags).HasMaxLength(2048);
2324

2425
builder.HasIndex(x => new { x.IsPublished, x.UpdatedDate })
2526
.HasDatabaseName("IX_BlogPosts_IsPublished_UpdatedDate")

src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/SimilarBlogPostConfiguration.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ public void Configure(EntityTypeBuilder<SimilarBlogPost> builder)
1212
builder.Property(b => b.Id)
1313
.IsUnicode(false)
1414
.ValueGeneratedOnAdd();
15-
builder.Property(b => b.SimilarBlogPostIds).HasMaxLength(450 * 3).IsRequired();
15+
16+
builder
17+
.Property(b => b.SimilarBlogPostIds)
18+
.HasMaxLength(450 * 3)
19+
.IsRequired();
1620
}
1721
}

src/LinkDotNet.Blog.Web/RegistrationExtensions/SqlRegistrationExtensions.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ public static void UseMySqlAsStorageProvider(this IServiceCollection services)
5454
{
5555
var configuration = s.GetRequiredService<IOptions<ApplicationConfiguration>>();
5656
var connectionString = configuration.Value.ConnectionString;
57-
builder.UseMySQL(connectionString)
57+
builder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), mySqlOptions =>
58+
{
59+
mySqlOptions.EnablePrimitiveCollectionsSupport();
60+
})
5861
#if DEBUG
5962
.EnableDetailedErrors()
6063
#endif

0 commit comments

Comments
 (0)