tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 02:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 OracleOledb 引起的读取类型问题；

Browse Source 
- 调整 DynamicEntity API；#1505
This commit is contained in:
2881099 2023-05-05 17:01:52 +08:00
parent 0d4199eca0
commit fb7eb01a2b
14 changed files with 109 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Extensions/FreeSql.Extensions.DynamicEntity/DynamicCompileHelper.cs
View File

@ -1,92 +0,0 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Security.Cryptography;
using System.Text;
namespace FreeSql.Extensions.DynamicEntity
{
/// <summary>
/// 动态创建对象帮助类
/// </summary>
public class DynamicCompileHelper
{
/// <summary>
/// 动态构建Class - Type
/// </summary>
/// <returns></returns>
public static DynamicCompileBuilder DynamicBuilder()
{
return new DynamicCompileBuilder();
}
/// <summary>
/// 委托缓存
/// </summary>
private static readonly ConcurrentDictionary<string, Delegate> DelegateCache =
new ConcurrentDictionary<string, Delegate>();
/// <summary>
/// 设置动态对象的属性值
/// </summary>
/// <param name="type"></param>
/// <param name="porpertys"></param>
/// <returns></returns>
public static object CreateObjectByType(Type type, Dictionary<string, object> porpertys)
{
if (type == null)
return null;
object istance = Activator.CreateInstance(type);
if (istance == null)
return null;
//根据key确定缓存
var cacheKeyStr = string.Join("-", porpertys.Keys.OrderBy(s => s));
var dicKey = Md5Encryption(cacheKeyStr);
var cacheKey = $"{type.GetHashCode()}-{dicKey}";
var dynamicDelegate = DelegateCache.GetOrAdd(cacheKey, key =>
{
//表达式目录树构建委托
var typeParam = Expression.Parameter(type);
var dicParamType = typeof(Dictionary<string, object>);
var dicParam = Expression.Parameter(dicParamType);
var exps = new List<Expression>();
var tempRef = Expression.Variable(typeof(object));
foreach (var pinfo in porpertys)
{
var propertyInfo = type.GetProperty(pinfo.Key);
if (propertyInfo == null)
continue;
var propertyName = Expression.Constant(pinfo.Key, typeof(string));
exps.Add(Expression.Call(dicParam, dicParamType.GetMethod("TryGetValue"), propertyName, tempRef));
exps.Add(Expression.Assign(Expression.MakeMemberAccess(typeParam, propertyInfo),
Expression.Convert(tempRef, propertyInfo.PropertyType)));
exps.Add(Expression.Assign(tempRef, Expression.Default(typeof(object))));
}
var returnTarget = Expression.Label(type);
exps.Add(Expression.Return(returnTarget, typeParam));
exps.Add(Expression.Label(returnTarget, Expression.Default(type)));
var block = Expression.Block(new[] { tempRef }, exps);
var @delegate = Expression.Lambda(block, typeParam, dicParam).Compile();
return @delegate;
});
var dynamicInvoke = dynamicDelegate.DynamicInvoke(istance, porpertys);
return dynamicInvoke;
}
private static string Md5Encryption(string inputStr)
{
var result = string.Empty;
//32位大写
using (var md5 = MD5.Create())
{
var resultBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(inputStr));
result = BitConverter.ToString(resultBytes);
}
return result;
}
}
}

42
Extensions/FreeSql.Extensions.DynamicEntity/FreeSql.Extensions.DynamicEntity.csproj
View File

@ -1,42 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net451;net45;</TargetFrameworks>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin;Daily</Authors>
<Description>FreeSql 扩展包，可实现动态构建实体类，动态创建表.</Description>
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageTags>FreeSql;ORM</PackageTags>
<PackageId>$(AssemblyName)</PackageId>
<PackageIcon>logo.png</PackageIcon>
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.694</Version> <PackageId>$(AssemblyName)</PackageId>
<PackageIcon>logo.png</PackageIcon>
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<DocumentationFile>FreeSql.Extensions.DynamicEntity.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<None Include="../../logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<None Update="FreeSql.Extensions.DynamicEntity.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

81
Extensions/FreeSql.Extensions.DynamicEntity/FreeSql.Extensions.DynamicEntity.xml
View File

@ -1,81 +0,0 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>FreeSql.Extensions.DynamicEntity</name>
</assembly>
<members>
<member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
<summary>
动态创建实体类型
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Class(System.String,System.Attribute[])">
<summary>
配置Class
</summary>
<param name="className">类名</param>
<param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
<summary>
配置父类
</summary>
<param name="superClass">父类类型</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
<summary>
Emit动态创建出Class - Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
<summary>
首字母小写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
<summary>
首字母大写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileHelper">
<summary>
动态创建对象帮助类
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileHelper.DynamicBuilder">
<summary>
动态构建Class - Type
</summary>
<returns></returns>
</member>
<member name="F:FreeSql.Extensions.DynamicEntity.DynamicCompileHelper.DelegateCache">
<summary>
委托缓存
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileHelper.CreateObjectByType(System.Type,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
设置动态对象的属性值
</summary>
<param name="type"></param>
<param name="porpertys"></param>
<returns></returns>
</member>
</members>
</doc>

BIN
Extensions/FreeSql.Extensions.DynamicEntity/key.snk
View File

Binary file not shown.

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -800,5 +800,14 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

37
FreeSql.Tests/FreeSql.Tests/DynamicEntity/DynamicEntityTest.cs
View File

@ -11,15 +11,14 @@ namespace FreeSql.Tests.DynamicEntity
{ {
public class DynamicEntityTest public class DynamicEntityTest
{ {
private static IFreeSql fsql = new FreeSqlBuilder().UseConnectionString(DataType.PostgreSQL, private static IFreeSql fsql = new FreeSqlBuilder().UseConnectionString(DataType.Sqlite,
"Host=192.168.0.36;Port=5432;Username=postgres;Password=123; Database=test;ArrayNullabilityMode=Always;Pooling=true;Minimum Pool Size=1") "data source=:memory:")
.UseMonitorCommand(d => Console.WriteLine(d.CommandText)).Build(); .UseMonitorCommand(d => Console.WriteLine(d.CommandText)).Build();
[Fact] [Fact]
public void NormalTest() public void NormalTest()
{ {
Type type = DynamicCompileHelper.DynamicBuilder() var table = fsql.CodeFirst.DynamicEntity("NormalUsers")
.Class("NormalUsers")
.Property("Id", typeof(string)) .Property("Id", typeof(string))
.Property("Name", typeof(string)) .Property("Name", typeof(string))
.Property("Address", typeof(string)) .Property("Address", typeof(string))
@ -30,18 +29,17 @@ namespace FreeSql.Tests.DynamicEntity
["Id"] = Guid.NewGuid().ToString(), ["Id"] = Guid.NewGuid().ToString(),
["Address"] = "北京市" ["Address"] = "北京市"
}; };
var instance = DynamicCompileHelper.CreateObjectByType(type, dict); var instance = table.CreateInstance(dict);
//根据Type生成表 //根据Type生成表
fsql.CodeFirst.SyncStructure(type); fsql.CodeFirst.SyncStructure(table.Type);
fsql.Insert<object>().AsType(type).AppendData(instance).ExecuteAffrows(); fsql.Insert<object>().AsType(table.Type).AppendData(instance).ExecuteAffrows();
} }
[Fact] [Fact]
public void AttributeTest() public void AttributeTest()
{ {
Type type = DynamicCompileHelper.DynamicBuilder() var table = fsql.CodeFirst.DynamicEntity("AttributeUsers", new TableAttribute() { Name = "T_Attribute_User" },
.Class("AttributeUsers", new TableAttribute() { Name = "T_Attribute_User" }, new IndexAttribute("Name_Index1", "Name", false))
new IndexAttribute("Name_Index", "Name", false))
.Property("Id", typeof(int), .Property("Id", typeof(int),
new ColumnAttribute() { IsPrimary = true, IsIdentity = true, Position = 1 }) new ColumnAttribute() { IsPrimary = true, IsIdentity = true, Position = 1 })
.Property("Name", typeof(string), .Property("Name", typeof(string),
@ -54,19 +52,18 @@ namespace FreeSql.Tests.DynamicEntity
["Name"] = "张三", ["Name"] = "张三",
["Address"] = "北京市" ["Address"] = "北京市"
}; };
var instance = DynamicCompileHelper.CreateObjectByType(type, dict); var instance = table.CreateInstance(dict);
//根据Type生成表 //根据Type生成表
fsql.CodeFirst.SyncStructure(type); fsql.CodeFirst.SyncStructure(table.Type);
var insertId = fsql.Insert<object>().AsType(type).AppendData(instance).ExecuteIdentity(); var insertId = fsql.Insert<object>().AsType(table.Type).AppendData(instance).ExecuteIdentity();
var select = fsql.Select<object>().AsType(type).ToList(); var select = fsql.Select<object>().AsType(table.Type).ToList();
} }
[Fact] [Fact]
public void SuperClassTest() public void SuperClassTest()
{ {
Type type = DynamicCompileHelper.DynamicBuilder() var table = fsql.CodeFirst.DynamicEntity("Roles", new TableAttribute() { Name = "T_Role" },
.Class("Roles", new TableAttribute() { Name = "T_Role" }, new IndexAttribute("Name_Index2", "Name", false))
new IndexAttribute("Name_Index", "Name", false))
.Extend(typeof(BaseModel)) .Extend(typeof(BaseModel))
.Property("Id", typeof(int), .Property("Id", typeof(int),
new ColumnAttribute() { IsPrimary = true, IsIdentity = true, Position = 1 }) new ColumnAttribute() { IsPrimary = true, IsIdentity = true, Position = 1 })
@ -79,10 +76,10 @@ namespace FreeSql.Tests.DynamicEntity
["UpdateTime"] = DateTime.Now, ["UpdateTime"] = DateTime.Now,
["UpdatePerson"] = "admin" ["UpdatePerson"] = "admin"
}; };
var instance = DynamicCompileHelper.CreateObjectByType(type, dict); var instance = table.CreateInstance(dict);
//根据Type生成表 //根据Type生成表
fsql.CodeFirst.SyncStructure(type); fsql.CodeFirst.SyncStructure(table.Type);
fsql.Insert<object>().AsType(type).AppendData(instance).ExecuteAffrows(); fsql.Insert<object>().AsType(table.Type).AppendData(instance).ExecuteAffrows();
} }
} }
public class BaseModel public class BaseModel

1
FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
View File

@ -35,7 +35,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.DynamicEntity\FreeSql.Extensions.DynamicEntity.csproj" />
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" /> <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" />
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.Linq\FreeSql.Extensions.Linq.csproj" /> <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.Linq\FreeSql.Extensions.Linq.csproj" />
<ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" /> <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />

15
FreeSql.sln
View File

@ -125,8 +125,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.Xugu", "Pr
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.Xugu", "FreeSql.Tests\FreeSql.Tests.Provider.Xugu\FreeSql.Tests.Provider.Xugu.csproj", "{16C21D77-20AC-4722-AD97-F53BDDE8210C}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.Xugu", "FreeSql.Tests\FreeSql.Tests.Provider.Xugu\FreeSql.Tests.Provider.Xugu.csproj", "{16C21D77-20AC-4722-AD97-F53BDDE8210C}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.DynamicEntity", "Extensions\FreeSql.Extensions.DynamicEntity\FreeSql.Extensions.DynamicEntity.csproj", "{FC4639EC-7787-4F85-AC02-26875E39E573}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -749,18 +747,6 @@ Global
{16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x64.Build.0 = Release|Any CPU {16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x64.Build.0 = Release|Any CPU
{16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x86.ActiveCfg = Release|Any CPU {16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x86.ActiveCfg = Release|Any CPU
{16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x86.Build.0 = Release|Any CPU {16C21D77-20AC-4722-AD97-F53BDDE8210C}.Release|x86.Build.0 = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|x64.ActiveCfg = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|x64.Build.0 = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|x86.ActiveCfg = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Debug|x86.Build.0 = Debug|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|Any CPU.Build.0 = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|x64.ActiveCfg = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|x64.Build.0 = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|x86.ActiveCfg = Release|Any CPU
{FC4639EC-7787-4F85-AC02-26875E39E573}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -801,7 +787,6 @@ Global
{8A06B18A-A8BF-4AEA-AFE4-0F573C2DBFEE} = {2A381C57-2697-427B-9F10-55DA11FD02E4} {8A06B18A-A8BF-4AEA-AFE4-0F573C2DBFEE} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
{71A6F937-D11B-4AE4-9933-BB6B4D925665} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA} {71A6F937-D11B-4AE4-9933-BB6B4D925665} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
{8064870C-22EA-4A58-972D-DBD57D096D91} = {2A381C57-2697-427B-9F10-55DA11FD02E4} {8064870C-22EA-4A58-972D-DBD57D096D91} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
{FC4639EC-7787-4F85-AC02-26875E39E573} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
RESX_NeutralResourcesLanguage = en-US RESX_NeutralResourcesLanguage = en-US

69
Extensions/FreeSql.Extensions.DynamicEntity/DynamicCompileBuilder.cs → FreeSql/Extensions/DynamicEntityExtensions.cs
View File

@ -1,4 +1,14 @@
using System; // by: Daily
#if net40 || NETSTANDARD2_0
# else
using FreeSql;
using FreeSql.DataAnnotations;
using FreeSql.Extensions.DynamicEntity;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -7,6 +17,50 @@ using System.Reflection.Emit;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
public static class FreeSqlGlobalDynamicEntityExtensions
{
/// <summary>
/// 动态构建Class Type
/// </summary>
/// <returns></returns>
public static DynamicCompileBuilder DynamicEntity(this ICodeFirst codeFirst, string className, params Attribute[] attributes)
{
return new DynamicCompileBuilder((codeFirst as CodeFirstProvider)._orm, className, attributes);
}
/// <summary>
/// 根据字典，创建 table 对应的实体对象
/// </summary>
/// <param name="table"></param>
/// <param name="dict"></param>
/// <returns></returns>
public static object CreateInstance(this TableInfo table, Dictionary<string, object> dict)
{
if (table == null || dict == null) return null;
var instance = table.Type.CreateInstanceGetDefaultValue();
foreach (var key in table.ColumnsByCs.Keys)
{
if (dict.ContainsKey(key) == false) continue;
table.ColumnsByCs[key].SetValue(instance, dict[key]);
}
return instance;
}
/// <summary>
/// 根据实体对象，创建 table 对应的字典
/// </summary>
/// <param name="table"></param>
/// <param name="instance"></param>
/// <returns></returns>
public static Dictionary<string, object> CreateDictionary(this TableInfo table, object instance)
{
if (table == null || instance == null) return null;
var dict = new Dictionary<string, object>();
foreach (var key in table.ColumnsByCs.Keys)
dict[key] = table.ColumnsByCs[key].GetValue(instance);
return dict;
}
}
namespace FreeSql.Extensions.DynamicEntity namespace FreeSql.Extensions.DynamicEntity
{ {
/// <summary> /// <summary>
@ -18,6 +72,7 @@ namespace FreeSql.Extensions.DynamicEntity
private Attribute[] _tableAttributes = null; private Attribute[] _tableAttributes = null;
private List<DynamicPropertyInfo> _properties = new List<DynamicPropertyInfo>(); private List<DynamicPropertyInfo> _properties = new List<DynamicPropertyInfo>();
private Type _superClass = null; private Type _superClass = null;
private IFreeSql _fsql = null;
/// <summary> /// <summary>
/// 配置Class /// 配置Class
@ -25,11 +80,11 @@ namespace FreeSql.Extensions.DynamicEntity
/// <param name="className">类名</param> /// <param name="className">类名</param>
/// <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param> /// <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
/// <returns></returns> /// <returns></returns>
public DynamicCompileBuilder Class(string className, params Attribute[] attributes) public DynamicCompileBuilder(IFreeSql fsql, string className, params Attribute[] attributes)
{ {
_fsql = fsql;
_className = className; _className = className;
_tableAttributes = attributes; _tableAttributes = attributes;
return this;
} }
/// <summary> /// <summary>
@ -157,7 +212,7 @@ namespace FreeSql.Extensions.DynamicEntity
/// Emit动态创建出Class - Type /// Emit动态创建出Class - Type
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public Type Build() public TableInfo Build()
{ {
//初始化AssemblyName的一个实例 //初始化AssemblyName的一个实例
var assemblyName = new AssemblyName("FreeSql.DynamicCompileBuilder"); var assemblyName = new AssemblyName("FreeSql.DynamicCompileBuilder");
@ -177,7 +232,8 @@ namespace FreeSql.Extensions.DynamicEntity
SetPropertys(ref typeBuilder); SetPropertys(ref typeBuilder);
//创建类的Type对象 //创建类的Type对象
return typeBuilder.CreateType(); var type = typeBuilder.CreateType();
return _fsql.CodeFirst.GetTableByEntity(type);
} }
/// <summary> /// <summary>
@ -226,4 +282,5 @@ namespace FreeSql.Extensions.DynamicEntity
public Attribute[] Attributes { get; set; } public Attribute[] Attributes { get; set; }
} }
} }
} }
#endif

183
FreeSql/FreeSql.xml
View File

@ -3519,177 +3519,6 @@
<param name="parms"></param> <param name="parms"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IAdo.ExecuteConnectTestAsync(System.Int32,System.Threading.CancellationToken)">
<summary>
测试数据库是否连接正确，本方法执行如下命令：<para></para>
MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
Oracle: SELECT 1 FROM dual<para></para>
</summary>
<param name="commandTimeout">命令超时设置(秒)</param>
<param name="cancellationToken"></param>
<returns>true: 成功, false: 失败</returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="readerHander"></param>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > @age; select * from address", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression"> <member name="E:FreeSql.IAop.ParseExpression">
<summary> <summary>
可自定义解析表达式 可自定义解析表达式
@ -4680,12 +4509,6 @@
<param name="timeout">超时</param> <param name="timeout">超时</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)"> <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary> <summary>
使用完毕后，归还资源 使用完毕后，归还资源
@ -4761,12 +4584,6 @@
</summary> </summary>
<param name="obj">资源对象</param> <param name="obj">资源对象</param>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
<summary>
从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
</summary>
<param name="obj">资源对象</param>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})"> <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
<summary> <summary>
归还对象给对象池的时候触发 归还对象给对象池的时候触发

1
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@ -342,6 +342,7 @@ namespace FreeSql.Internal.CommonProvider
[typeof(string)] = typeof(DbDataReader).GetMethod("GetString", new Type[] { typeof(int) }), [typeof(string)] = typeof(DbDataReader).GetMethod("GetString", new Type[] { typeof(int) }),
//[typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) }) 有些驱动不兼容 //[typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) }) 有些驱动不兼容
}; };
public static Dictionary<DataType, Dictionary<Type, MethodInfo>> _dicMethodDataReaderGetValueOverride = new Dictionary<DataType, Dictionary<Type, MethodInfo>>();
public static MethodInfo MethodStringContains = typeof(string).GetMethod("Contains", new[] { typeof(string) }); public static MethodInfo MethodStringContains = typeof(string).GetMethod("Contains", new[] { typeof(string) });
public static MethodInfo MethodStringStartsWith = typeof(string).GetMethod("StartsWith", new[] { typeof(string) }); public static MethodInfo MethodStringStartsWith = typeof(string).GetMethod("StartsWith", new[] { typeof(string) });

5
FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
View File

@ -744,8 +744,11 @@ namespace FreeSql.Internal.CommonProvider
_orm.Aop.AuditDataReaderHandler == null && _orm.Aop.AuditDataReaderHandler == null &&
_dicMethodDataReaderGetValue.TryGetValue(col.Attribute.MapType.NullableTypeOrThis(), out var drGetValueMethod)) _dicMethodDataReaderGetValue.TryGetValue(col.Attribute.MapType.NullableTypeOrThis(), out var drGetValueMethod))
{ {
if (_dicMethodDataReaderGetValueOverride.TryGetValue(_orm.Ado.DataType, out var drDictOverride) && drDictOverride.TryGetValue(col.Attribute.MapType.NullableTypeOrThis(), out var drDictOverrideGetValueMethod))
drGetValueMethod = drDictOverrideGetValueMethod;
Expression drvalExp = Expression.Call(rowExp, drGetValueMethod, Expression.Constant(colidx)); Expression drvalExp = Expression.Call(rowExp, drGetValueMethod, Expression.Constant(colidx));
if (col.CsType.IsNullableType()) drvalExp = Expression.Convert(drvalExp, col.CsType); if (col.CsType.IsNullableType() || drGetValueMethod.ReturnType != col.CsType) drvalExp = Expression.Convert(drvalExp, col.CsType);
drvalExp = Expression.Condition(Expression.Call(rowExp, _MethodDataReaderIsDBNull, Expression.Constant(colidx)), Expression.Default(col.CsType), drvalExp); drvalExp = Expression.Condition(Expression.Call(rowExp, _MethodDataReaderIsDBNull, Expression.Constant(colidx)), Expression.Default(col.CsType), drvalExp);
if (drvalType.IsArray || drvalType.IsEnum || Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(drvalType)) if (drvalType.IsArray || drvalType.IsEnum || Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(drvalType))

7
Providers/FreeSql.Provider.MySql/MySqlProvider.cs
View File

@ -2,8 +2,10 @@
using FreeSql.Internal.CommonProvider; using FreeSql.Internal.CommonProvider;
using FreeSql.MySql.Curd; using FreeSql.MySql.Curd;
using System; using System;
using System.Collections.Generic;
using System.Data.Common; using System.Data.Common;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection;
using System.Threading; using System.Threading;
namespace FreeSql.MySql namespace FreeSql.MySql
@ -35,8 +37,9 @@ namespace FreeSql.MySql
return null; return null;
}); });
Select0Provider._dicMethodDataReaderGetValue[typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.MySql] = new Dictionary<Type, MethodInfo>();
Select0Provider._dicMethodDataReaderGetValue[typeof(DateTimeOffset)] = typeof(DbDataReader).GetMethod("GetDateTime", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.MySql][typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValueOverride[DataType.MySql][typeof(DateTimeOffset)] = typeof(DbDataReader).GetMethod("GetDateTime", new Type[] { typeof(int) });
} }
public override ISelect<T1> CreateSelectProvider<T1>(object dywhere) => new MySqlSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere); public override ISelect<T1> CreateSelectProvider<T1>(object dywhere) => new MySqlSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);

17
Providers/FreeSql.Provider.Oracle/OracleProvider.cs
View File

@ -6,6 +6,8 @@ using System.Text.RegularExpressions;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Threading; using System.Threading;
using System.IO; using System.IO;
using System.Collections.Generic;
using System.Reflection;
namespace FreeSql.Oracle namespace FreeSql.Oracle
{ {
@ -30,13 +32,14 @@ namespace FreeSql.Oracle
this.CodeFirst = new OracleCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression); this.CodeFirst = new OracleCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
#if oledb #if oledb
Select0Provider._dicMethodDataReaderGetValue[typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle] = new Dictionary<Type, MethodInfo>();
Select0Provider._dicMethodDataReaderGetValue[typeof(bool)] = typeof(DbDataReader).GetMethod("GetBoolean", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(Guid)] = typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValue[typeof(int)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(bool)] = typeof(DbDataReader).GetMethod("GetBoolean", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValue[typeof(long)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(int)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValue[typeof(decimal)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(long)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValue[typeof(DateTime)] = typeof(DbDataReader).GetMethod("GetDateTime", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(decimal)] = typeof(DbDataReader).GetMethod("GetDecimal", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValue[typeof(string)] = typeof(DbDataReader).GetMethod("GetString", new Type[] { typeof(int) }); Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(DateTime)] = typeof(DbDataReader).GetMethod("GetDateTime", new Type[] { typeof(int) });
Select0Provider._dicMethodDataReaderGetValueOverride[DataType.Oracle][typeof(string)] = typeof(DbDataReader).GetMethod("GetString", new Type[] { typeof(int) });
this.Aop.CommandBefore += (_, e) => this.Aop.CommandBefore += (_, e) =>
{ {