From 74a2cf53172ae452f3f7ea3ed207d7db729670db Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Sat, 27 Apr 2019 01:22:38 +0800 Subject: [PATCH] update --- .../CodeFirstExtensions.cs | 67 ------------------- ...eeSql.Extensions.EFCoreModelBuilder.csproj | 21 ------ FreeSql.sln | 14 ---- 3 files changed, 102 deletions(-) delete mode 100644 FreeSql.Extensions.EFCoreModelBuilder/CodeFirstExtensions.cs delete mode 100644 FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj diff --git a/FreeSql.Extensions.EFCoreModelBuilder/CodeFirstExtensions.cs b/FreeSql.Extensions.EFCoreModelBuilder/CodeFirstExtensions.cs deleted file mode 100644 index 276097e1..00000000 --- a/FreeSql.Extensions.EFCoreModelBuilder/CodeFirstExtensions.cs +++ /dev/null @@ -1,67 +0,0 @@ -using FreeSql; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata; -using System; -using System.Linq; - -public static class FreeSqlExtensionsEFCoreModelBuilderCodeFirstExtensions { - -public static void ConfigEntity(this ICodeFirst codeFirst, IModel efmodel) { - - foreach (var type in efmodel.GetEntityTypes()) { - - codeFirst.ConfigEntity(type.ClrType, a => { - - //表名 - var relationalTableName = type.FindAnnotation("Relational:TableName"); - if (relationalTableName != null) { - a.Name(relationalTableName.Value?.ToString() ?? type.ClrType.Name); - } - - foreach (var prop in type.GetProperties()) { - - var freeProp = a.Property(prop.Name); - - //列名 - var relationalColumnName = prop.FindAnnotation("Relational:ColumnName"); - if (relationalColumnName != null) { - - freeProp.Name(relationalColumnName.Value?.ToString() ?? prop.Name); - } - - //主键 - freeProp.IsPrimary(prop.IsPrimaryKey()); - - //自增 - freeProp.IsIdentity( - prop.ValueGenerated == ValueGenerated.Never || - prop.ValueGenerated == ValueGenerated.OnAdd || - prop.GetAnnotations().Where(z => - z.Name == "SqlServer:ValueGenerationStrategy" && z.Value.ToString().Contains("IdentityColumn") //sqlserver 自增 - || z.Value.ToString().Contains("IdentityColumn") //其他数据库实现未经测试 - ).Any() - ); - - //可空 - freeProp.IsNullable(prop.AfterSaveBehavior != PropertySaveBehavior.Throw); - - //类型 - var relationalColumnType = prop.FindAnnotation("Relational:ColumnType"); - if (relationalColumnType != null) { - - var dbType = relationalColumnType.ToString(); - - if (!string.IsNullOrEmpty(dbType)) { - - var maxLength = prop.FindAnnotation("MaxLength"); - if (maxLength != null) - dbType += $"({maxLength})"; - - freeProp.DbType(dbType); - } - } - } - }); - } -} -} \ No newline at end of file diff --git a/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj b/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj deleted file mode 100644 index e11ffc62..00000000 --- a/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netstandard2.0 - 0.0.12 - FreeSql - FreeSql - FreeSql ICodeFirst 扩展库，实现从 EFCore FluentAPI/Attribute 读取，从而做到无缝接入已使用 EFCore 项目开发。 - https://github.com/2881099/FreeSql - https://github.com/2881099/FreeSql - - - - - - - - - - - diff --git a/FreeSql.sln b/FreeSql.sln index e390b197..b25315b6 100644 --- a/FreeSql.sln +++ b/FreeSql.sln @@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{C6A74E2A-6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.PerformanceTests", "FreeSql.Tests.PerformanceTests\FreeSql.Tests.PerformanceTests.csproj", "{446D9CBE-BFE4-4FB3-ADFD-4C1C5EA1B6EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.EFCoreModelBuilder", "FreeSql.Extensions.EFCoreModelBuilder\FreeSql.Extensions.EFCoreModelBuilder.csproj", "{490CC8AF-C47C-4139-AED7-4FB6502F622B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{94C8A78D-AA15-47B2-A348-530CD86BFC1B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "restful", "Examples\restful\restful.csproj", "{83D10565-AF9D-4EDC-8FB8-8C962A843F97}" @@ -72,18 +70,6 @@ Global {446D9CBE-BFE4-4FB3-ADFD-4C1C5EA1B6EE}.Release|x64.Build.0 = Release|Any CPU {446D9CBE-BFE4-4FB3-ADFD-4C1C5EA1B6EE}.Release|x86.ActiveCfg = Release|Any CPU {446D9CBE-BFE4-4FB3-ADFD-4C1C5EA1B6EE}.Release|x86.Build.0 = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|x64.ActiveCfg = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|x64.Build.0 = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|x86.ActiveCfg = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Debug|x86.Build.0 = Debug|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|Any CPU.Build.0 = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|x64.ActiveCfg = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|x64.Build.0 = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|x86.ActiveCfg = Release|Any CPU - {490CC8AF-C47C-4139-AED7-4FB6502F622B}.Release|x86.Build.0 = Release|Any CPU {83D10565-AF9D-4EDC-8FB8-8C962A843F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {83D10565-AF9D-4EDC-8FB8-8C962A843F97}.Debug|Any CPU.Build.0 = Debug|Any CPU {83D10565-AF9D-4EDC-8FB8-8C962A843F97}.Debug|x64.ActiveCfg = Debug|Any CPU