weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-09 18:00:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 ZeroEntity WhereExists 问题；

Browse Source
This commit is contained in:
2881099
2025-04-21 10:11:12 +08:00
parent d90257fa1f
commit 5625fe1e07
4 changed files with 189 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Examples/zero_entity/Program.cs
View File

@@ -15,7 +15,64 @@ using (var fsql = new FreeSqlBuilder()
.UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n")) .UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n"))
.Build()) .Build())
{ {
var json = JsonConvert.SerializeObject(Helper.GetTestDesc()); var table1 = new TableDescriptor
{
Name = "aaa",
DisableSyncStructure = false,
Comment = "测试表"
};
table1.Columns.Add(new TableDescriptor.ColumnDescriptor
{
Name = "Column1",
DbType = "varchar",
IsPrimary = true,
IsIdentity = true,
IsNullable = false,
MapType = typeof(string),
Comment = "主键"
});
table1.Columns.Add(new TableDescriptor.ColumnDescriptor
{
Name = "Column2",
DbType = "varchar",
IsNullable = false,
MapType = typeof(string),
Comment = "名称"
});
var table2 = new TableDescriptor
{
Name = "bbb",
DisableSyncStructure = false,
Comment = "测试表"
};
table2.Columns.Add(new TableDescriptor.ColumnDescriptor
{
Name = "Column1",
DbType = "varchar",
IsPrimary = true,
IsIdentity = true,
IsNullable = false,
MapType = typeof(string),
Comment = "主键"
});
table2.Columns.Add(new TableDescriptor.ColumnDescriptor
{
Name = "Column2",
DbType = "varchar",
IsNullable = false,
MapType = typeof(string),
Comment = "名称"
});
var context = new ZeroDbContext(fsql, [table1, table2]);
var sql = context.Select
.WhereExists(subQuery =>
{
return subQuery.From("bbb").Where("Column1", "aaa");
}).ToSql();
Console.WriteLine(sql);
var json = JsonConvert.SerializeObject(Helper.GetTestDesc());
var dyctx = new ZeroDbContext(fsql, JsonConvert.DeserializeObject<TableDescriptor[]>(@" var dyctx = new ZeroDbContext(fsql, JsonConvert.DeserializeObject<TableDescriptor[]>(@"
[ [

6
Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.xml
View File

@@ -84,17 +84,17 @@
</member> </member>
<member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.Where(System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})"> <member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.Where(System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})">
<summary> <summary>
WHERE [Id] IN (...) WHERE [Id] IN (1,2,3)
</summary> </summary>
</member> </member>
<member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereIn(System.String,System.Object)"> <member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereIn(System.String,System.Object)">
<summary> <summary>
WHERE [field] IN (...) WHERE [field] IN (1,2,3)
</summary> </summary>
</member> </member>
<member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereNotIn(System.String,System.Object)"> <member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereNotIn(System.String,System.Object)">
<summary> <summary>
WHERE [field] NOT IN (...) WHERE [field] NOT IN (1,2,3)
</summary> </summary>
</member> </member>
<member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereDynamic(System.Object)"> <member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.WhereDynamic(System.Object)">

37
Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs
View File

@@ -8,6 +8,7 @@ using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using T = System.Collections.Generic.Dictionary<string, object>; using T = System.Collections.Generic.Dictionary<string, object>;
namespace FreeSql.Extensions.ZeroEntity namespace FreeSql.Extensions.ZeroEntity
@@ -533,7 +534,7 @@ namespace FreeSql.Extensions.ZeroEntity
return this; return this;
} }
NativeTuple<string, ColumnInfo> ParseField(ZeroTableInfo firstTable, string firstTableAlias, string property) NativeTuple<string, ColumnInfo, string> ParseField(ZeroTableInfo firstTable, string firstTableAlias, string property)
{ {
if (string.IsNullOrEmpty(property)) return null; if (string.IsNullOrEmpty(property)) return null;
var field = property.Split('.').Select(a => a.Trim()).ToArray(); var field = property.Split('.').Select(a => a.Trim()).ToArray();
@@ -541,43 +542,43 @@ namespace FreeSql.Extensions.ZeroEntity
if (field.Length == 1) if (field.Length == 1)
{ {
if (firstTable != null && firstTable.ColumnsByCs.TryGetValue(field[0], out var col2) == true) if (firstTable != null && firstTable.ColumnsByCs.TryGetValue(field[0], out var col2) == true)
return NativeTuple.Create($"{firstTableAlias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{firstTableAlias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, firstTableAlias);
foreach (var ta2 in _tableAlias) foreach (var ta2 in _tableAlias)
{ {
if (ta2.Table.ColumnsByCs.TryGetValue(field[0], out col2)) if (ta2.Table.ColumnsByCs.TryGetValue(field[0], out col2))
return NativeTuple.Create($"{ta2.Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{ta2.Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, ta2.Alias);
} }
} }
else if (field.Length == 2) else if (field.Length == 2)
{ {
if (firstTable != null && firstTable.CsName.ToLower() == field[0].ToLower() && firstTable.ColumnsByCs.TryGetValue(field[1], out var col2) == true) if (firstTable != null && firstTable.CsName.ToLower() == field[0].ToLower() && firstTable.ColumnsByCs.TryGetValue(field[1], out var col2) == true)
return NativeTuple.Create($"{firstTableAlias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{firstTableAlias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, firstTableAlias);
var ta2s = _tableAlias.Where(a => a.Table.CsName.ToLower() == field[0].ToLower()).ToArray(); var ta2s = _tableAlias.Where(a => a.Table.CsName.ToLower() == field[0].ToLower()).ToArray();
if (ta2s.Length == 1 && ta2s[0].Table.ColumnsByCs.TryGetValue(field[1], out col2) == true) if (ta2s.Length == 1 && ta2s[0].Table.ColumnsByCs.TryGetValue(field[1], out col2) == true)
return NativeTuple.Create($"{ta2s[0].Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{ta2s[0].Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, ta2s[0].Alias);
if (ta2s.Length > 1) if (ta2s.Length > 1)
{ {
ta2s = _tableAlias.Where(a => a.Table.CsName == field[0]).ToArray(); ta2s = _tableAlias.Where(a => a.Table.CsName == field[0]).ToArray();
if (ta2s.Length == 1 && ta2s[0].Table.ColumnsByCs.TryGetValue(field[1], out col2) == true) if (ta2s.Length == 1 && ta2s[0].Table.ColumnsByCs.TryGetValue(field[1], out col2) == true)
return NativeTuple.Create($"{ta2s[0].Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{ta2s[0].Alias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, ta2s[0].Alias);
} }
if (_tableAlias.Where(a => a.Alias == field[0]).FirstOrDefault()?.Table.ColumnsByCs.TryGetValue(field[1], out col2) == true) if (_tableAlias.Where(a => a.Alias == field[0]).FirstOrDefault()?.Table.ColumnsByCs.TryGetValue(field[1], out col2) == true)
return NativeTuple.Create($"{field[0]}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2); return NativeTuple.Create($"{field[0]}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, field[0]);
} }
var navPath = string.Join(".", field.Skip(1).Take(field.Length - 1)); var navPath = string.Join(".", field.Skip(1).Take(field.Length - 1));
var ta = _tableAlias.Where(a => string.Join(".", a.NavPath) == navPath).FirstOrDefault(); var ta = _tableAlias.Where(a => string.Join(".", a.NavPath) == navPath).FirstOrDefault();
if (ta?.Table.ColumnsByCs.TryGetValue(field.Last(), out var col) == true) if (ta?.Table.ColumnsByCs.TryGetValue(field.Last(), out var col) == true)
return NativeTuple.Create($"{ta.Alias}.{_common.QuoteSqlName(col.Attribute.Name)}", col); return NativeTuple.Create($"{ta.Alias}.{_common.QuoteSqlName(col.Attribute.Name)}", col, ta.Alias);
throw new Exception(CoreErrorStrings.Cannot_Match_Property(property)); throw new Exception(CoreErrorStrings.Cannot_Match_Property(property));
} }
/// <summary> /// <summary>
/// WHERE [Id] IN (...) /// WHERE [Id] IN (1,2,3)
/// </summary> /// </summary>
public SelectImpl Where(IEnumerable<T> items) public SelectImpl Where(IEnumerable<T> items)
{ {
var alias = _tableAlias.Where(a => a.Table == _tables[_mainTableIndex]).FirstOrDefault()?.Alias; var alias = _tableAlias.Where(a => a.Table == _tables[_mainTableIndex]).FirstOrDefault()?.Alias;
if (!string.IsNullOrWhiteSpace(alias)) alias = $"{alias}."; if (!string.IsNullOrWhiteSpace(alias)) alias = $"{alias}.";
@@ -586,12 +587,12 @@ namespace FreeSql.Extensions.ZeroEntity
return this; return this;
} }
/// <summary> /// <summary>
/// WHERE [field] IN (...) /// WHERE [field] IN (1,2,3)
/// </summary> /// </summary>
public SelectImpl WhereIn(string field, object value) => Where(field, "in", value); public SelectImpl WhereIn(string field, object value) => Where(field, "in", value);
public SelectImpl WhereInIf(bool condition, string field, object value) => condition ? Where(field, "in", value) : this; public SelectImpl WhereInIf(bool condition, string field, object value) => condition ? Where(field, "in", value) : this;
/// <summary> /// <summary>
/// WHERE [field] NOT IN (...) /// WHERE [field] NOT IN (1,2,3)
/// </summary> /// </summary>
public SelectImpl WhereNotIn(string field, object value) => Where(field, "!in", value); public SelectImpl WhereNotIn(string field, object value) => Where(field, "!in", value);
public SelectImpl WhereNotInIf(bool condition, string field, object value) => condition ? Where(field, "!in", value) : this; public SelectImpl WhereNotInIf(bool condition, string field, object value) => condition ? Where(field, "!in", value) : this;
@@ -716,7 +717,7 @@ namespace FreeSql.Extensions.ZeroEntity
string ParseDynamicFilter(DynamicFilterInfo filter) string ParseDynamicFilter(DynamicFilterInfo filter)
{ {
var replacedFilter = new DynamicFilterInfo(); var replacedFilter = new DynamicFilterInfo();
var replacedMap = new List<NativeTuple<string, string>>(); var replacedMap = new List<NativeTuple<string, string, string>>();
LocalCloneFilter(filter, replacedFilter); LocalCloneFilter(filter, replacedFilter);
var oldWhere = _selectProvider._where.ToString(); var oldWhere = _selectProvider._where.ToString();
var newWhere = ""; var newWhere = "";
@@ -732,9 +733,9 @@ namespace FreeSql.Extensions.ZeroEntity
} }
foreach (var rm in replacedMap) foreach (var rm in replacedMap)
{ {
var find = $"a.{_common.QuoteSqlName(rm.Item1)}"; var find = $"{rm.Item3}.{_common.QuoteSqlName(rm.Item1)}";
var idx = newWhere.IndexOf(find); var idx = newWhere.IndexOf(find);
if (idx != -1) newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}"; if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]")) newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
} }
return newWhere; return newWhere;
@@ -753,7 +754,7 @@ namespace FreeSql.Extensions.ZeroEntity
target.Field = pname; target.Field = pname;
else else
target.Field = TestDynamicFilterInfo._dictTypeToPropertyname[typeof(string)]; target.Field = TestDynamicFilterInfo._dictTypeToPropertyname[typeof(string)];
replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1)); replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1, parseResult.Item3));
} }
} }
if (source.Filters?.Any() == true) if (source.Filters?.Any() == true)

109
FreeSql/FreeSql.xml
View File

@@ -1097,6 +1097,93 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
<summary>
动态创建实体类型
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,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="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
<summary>
获取类型构建器，可作为要构建的Type来引用
</summary>
</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.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="defaultValue">属性默认值</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.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
<summary>
Override属性
</summary>
<param name="typeBuilder"></param>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
<summary>
Emit动态创建出Class - Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
<summary>
Emit动态创建出Class - Type，不附带获取TableInfo
</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="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)"> <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
<summary> <summary>
获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 "" 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -5897,6 +5984,28 @@
对象池 对象池
</summary> </summary>
</member> </member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
<summary>
动态构建Class Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
根据字典，创建 table 对应的实体对象
</summary>
<param name="table"></param>
<param name="dict"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
<summary>
根据实体对象，创建 table 对应的字典
</summary>
<param name="table"></param>
<param name="instance"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)"> <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
<summary> <summary>
C#： that >= between &amp;&amp; that &lt;= and<para></para> C#： that >= between &amp;&amp; that &lt;= and<para></para>