IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dbip: refactoring

Browse Source
This commit is contained in:
Alexey Bannov 2023-05-06 20:22:36 +03:00
parent 9c9df73b96
commit 1aa1a3db94
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/ASC.Core.Common/EF/Model/DbIPLookup.cs
View File

@ -63,16 +63,15 @@ public static class DbIPLookupExtension
modelBuilder.Entity<DbIPLookup>(entity => modelBuilder.Entity<DbIPLookup>(entity =>
{ {
entity.ToTable("dbip_lookup") entity.ToTable("dbip_lookup")
.UseCollation("utf8mb4_0900_ai_ci"); .HasCharSet("utf8mb4");
entity.HasKey(nameof(DbIPLookup.AddrType), nameof(DbIPLookup.IPStart)); entity.HasKey(nameof(DbIPLookup.AddrType), nameof(DbIPLookup.IPStart));
entity.Property(e => e.AddrType) entity.Property(e => e.AddrType)
.IsRequired() .IsRequired()
.HasColumnName("addr_type") .HasColumnName("addr_type")
.HasColumnType("enum('ipv4','ipv6')") .HasColumnType("enum('ipv4','ipv6')");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.IPStart) entity.Property(e => e.IPStart)
.IsRequired() .IsRequired()
.HasColumnName("ip_start") .HasColumnName("ip_start")
@ -86,45 +85,36 @@ public static class DbIPLookupExtension
entity.Property(e => e.Continent) entity.Property(e => e.Continent)
.IsRequired() .IsRequired()
.HasColumnName("continent") .HasColumnName("continent")
.HasColumnType("char(2)") .HasColumnType("char(2)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.Country) entity.Property(e => e.Country)
.IsRequired() .IsRequired()
.HasColumnName("country") .HasColumnName("country")
.HasColumnType("char(2)") .HasColumnType("char(2)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.StateProvCode) entity.Property(e => e.StateProvCode)
.HasColumnName("stateprov_code") .HasColumnName("stateprov_code")
.HasColumnType("varchar(15)") .HasColumnType("varchar(15)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.StateProv) entity.Property(e => e.StateProv)
.IsRequired() .IsRequired()
.HasColumnName("stateprov") .HasColumnName("stateprov")
.HasColumnType("varchar(80)") .HasColumnType("varchar(80)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.District) entity.Property(e => e.District)
.IsRequired() .IsRequired()
.HasColumnName("district") .HasColumnName("district")
.HasColumnType("varchar(80)") .HasColumnType("varchar(80)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.City) entity.Property(e => e.City)
.IsRequired() .IsRequired()
.HasColumnName("city") .HasColumnName("city")
.HasColumnType("varchar(80)") .HasColumnType("varchar(80)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.ZipCode) entity.Property(e => e.ZipCode)
.HasColumnName("zipcode") .HasColumnName("zipcode")
.HasColumnType("varchar(20)") .HasColumnType("varchar(20)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.Latitude) entity.Property(e => e.Latitude)
.IsRequired() .IsRequired()
@ -144,21 +134,17 @@ public static class DbIPLookupExtension
entity.Property(e => e.TimezoneOffset) entity.Property(e => e.TimezoneOffset)
.IsRequired() .IsRequired()
.HasColumnType("float") .HasColumnType("float")
.HasColumnName("timezone_offset"); .HasColumnName("timezone_offset");
entity.Property(e => e.TimezoneName) entity.Property(e => e.TimezoneName)
.IsRequired() .IsRequired()
.HasColumnName("timezone_name") .HasColumnName("timezone_name")
.HasColumnType("varchar(64)") .HasColumnType("varchar(64)");
.UseCollation("utf8mb4_0900_ai_ci");
entity.Property(e => e.WeatherCode) entity.Property(e => e.WeatherCode)
.IsRequired() .IsRequired()
.HasColumnName("weather_code") .HasColumnName("weather_code")
.HasColumnType("varchar(10)") .HasColumnType("varchar(10)");
.UseCollation("utf8mb4_0900_ai_ci");
}); });
} }