tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 01:05:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 Enum -> MapType(string) + GroupBy 解析问题；#1727

Browse Source
This commit is contained in:
2881099
2024-01-26 19:33:49 +08:00
parent 2598451261
commit 2a2be54986
7 changed files with 20 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -806,14 +806,5 @@
<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>

4
FreeSql.Tests/FreeSql.Tests/Issues/1237.cs
View File

@@ -36,11 +36,11 @@ ORDER BY b.""Name"", b.""ID""", people1);
.ToSql(); .ToSql();
Assert.Equal(@"SELECT * Assert.Equal(@"SELECT *
FROM ( FROM (
SELECT replace(replace(a.""Name"", ' ', ''), '　', '') ""xm_new"", a.""CSNY"" ""csny"" SELECT replace(replace(a.""Name"", ' ', ''), '　', '') ""xm"", a.""CSNY"" ""csny""
FROM ""people_issues_1237"" a FROM ""people_issues_1237"" a
GROUP BY replace(replace(a.""Name"", ' ', ''), '　', ''), a.""CSNY"" GROUP BY replace(replace(a.""Name"", ' ', ''), '　', ''), a.""CSNY""
HAVING (count(1) > 1) ) a HAVING (count(1) > 1) ) a
INNER JOIN ""people_issues_1237"" b ON a.""xm_new"" = replace(replace(b.""Name"", ' ', ''), '　', '') AND a.""csny"" = b.""CSNY"" INNER JOIN ""people_issues_1237"" b ON a.""xm"" = replace(replace(b.""Name"", ' ', ''), '　', '') AND a.""csny"" = b.""CSNY""
ORDER BY b.""Name"", b.""ID""", people2); ORDER BY b.""Name"", b.""ID""", people2);
} }

112
FreeSql/FreeSql.xml
View File

@@ -6337,115 +6337,3 @@
</member> </member>
</members> </members>
</doc> </doc>
`0})">
<summary>
插入数据，传入实体集合
</summary>
<typeparam name="T1"></typeparam>
<param name="source"></param>
<returns></returns>
</member>
<member name="M:IFreeSql.InsertOrUpdate``1">
<summary>
插入或更新数据，此功能依赖数据库特性（低版本可能不支持），参考如下：<para></para>
MySql 5.6+: on duplicate key update<para></para>
PostgreSQL 9.4+: on conflict do update<para></para>
SqlServer 2008+: merge into<para></para>
Oracle 11+: merge into<para></para>
Sqlite: replace into<para></para>
达梦: merge into<para></para>
人大金仓：on conflict do update<para></para>
神通：merge into<para></para>
MsAccess：不支持<para></para>
注意区别：FreeSql.Repository 仓储也有 InsertOrUpdate 方法（不依赖数据库特性）
</summary>
<typeparam name="T1"></typeparam>
<returns></returns>
</member>
<member name="M:IFreeSql.Update``1">
<summary>
修改数据
</summary>
<typeparam name="T1"></typeparam>
<returns></returns>
</member>
<member name="M:IFreeSql.Update``1(System.Object)">
<summary>
修改数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
</summary>
<typeparam name="T1"></typeparam>
<param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
<returns></returns>
</member>
<member name="M:IFreeSql.Select``1">
<summary>
查询数据
</summary>
<typeparam name="T1"></typeparam>
<returns></returns>
</member>
<member name="M:IFreeSql.Select``1(System.Object)">
<summary>
查询数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
</summary>
<typeparam name="T1"></typeparam>
<param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
<returns></returns>
</member>
<member name="M:IFreeSql.Delete``1">
<summary>
删除数据
</summary>
<typeparam name="T1"></typeparam>
<returns></returns>
</member>
<member name="M:IFreeSql.Delete``1(System.Object)">
<summary>
删除数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
</summary>
<typeparam name="T1"></typeparam>
<param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
<returns></returns>
</member>
<member name="M:IFreeSql.Transaction(System.Action)">
<summary>
开启事务（不支持异步）<para></para>
v1.5.0 关闭了线程事务超时自动提交的机制
</summary>
<param name="handler">事务体 () => {}</param>
</member>
<member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.Action)">
<summary>
开启事务（不支持异步）<para></para>
v1.5.0 关闭了线程事务超时自动提交的机制
</summary>
<param name="isolationLevel"></param>
<param name="handler">事务体 () => {}</param>
</member>
<member name="P:IFreeSql.Ado">
<summary>
数据库访问对象
</summary>
</member>
<member name="P:IFreeSql.Aop">
<summary>
所有拦截方法都在这里
</summary>
</member>
<member name="P:IFreeSql.CodeFirst">
<summary>
CodeFirst 模式开发相关方法
</summary>
</member>
<member name="P:IFreeSql.DbFirst">
<summary>
DbFirst 模式开发相关方法
</summary>
</member>
<member name="P:IFreeSql.GlobalFilter">
<summary>
全局过滤设置，可默认附加为 Select/Update/Delete 条件
</summary>
</member>
</members>
</doc>

5
FreeSql/Internal/CommonExpression.cs
View File

@@ -26,6 +26,7 @@ namespace FreeSql.Internal
public ReadAnonymousTypeInfo _map; public ReadAnonymousTypeInfo _map;
public string _field; public string _field;
public ReadAnonymousTypeInfo ParseExpMapResult { get; internal protected set; } public ReadAnonymousTypeInfo ParseExpMapResult { get; internal protected set; }
public ColumnInfo ParseExpColumnResult { get; internal protected set; }
public abstract string ParseExp(Expression[] members); public abstract string ParseExp(Expression[] members);
} }
@@ -859,10 +860,10 @@ namespace FreeSql.Internal
} }
Type oldMapType = null; Type oldMapType = null;
if (tsc.diymemexp != null) tsc.diymemexp.ParseExpMapResult = null; if (tsc.diymemexp != null) tsc.diymemexp.ParseExpColumnResult = null;
var left = ExpressionLambdaToSql(leftExp, tsc); var left = ExpressionLambdaToSql(leftExp, tsc);
var leftMapColumn = SearchColumnByField(tsc._tables, tsc.currentTable, left) ?? var leftMapColumn = SearchColumnByField(tsc._tables, tsc.currentTable, left) ??
(tsc.diymemexp?.ParseExpMapResult?.Table?.ColumnsByCs.TryGetValue(tsc.diymemexp.ParseExpMapResult.CsName, out var dmcol) == true ? dmcol : null); //group by emum -> MapType(string) #1727 tsc.diymemexp?.ParseExpColumnResult; //group by emum -> MapType(string) #1727
var isLeftMapType = leftMapColumn != null && new[] { "AND", "OR", "*", "/", "+", "-" }.Contains(oper) == false && (leftMapColumn.Attribute.MapType != rightExp.Type || leftMapColumn.CsType != rightExp.Type); var isLeftMapType = leftMapColumn != null && new[] { "AND", "OR", "*", "/", "+", "-" }.Contains(oper) == false && (leftMapColumn.Attribute.MapType != rightExp.Type || leftMapColumn.CsType != rightExp.Type);
ColumnInfo rightMapColumn = null; ColumnInfo rightMapColumn = null;
var isRightMapType = false; var isRightMapType = false;

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

@@ -241,6 +241,7 @@ namespace FreeSql.Internal.CommonProvider
public override string ParseExp(Expression[] members) public override string ParseExp(Expression[] members)
{ {
ParseExpMapResult = null; ParseExpMapResult = null;
ParseExpColumnResult = null;
ParseExpMatchedTable = GetOutsideSelectTable(members.FirstOrDefault()?.GetParameter()); ParseExpMatchedTable = GetOutsideSelectTable(members.FirstOrDefault()?.GetParameter());
if (ParseExpMatchedTable == null) return null; if (ParseExpMatchedTable == null) return null;
@@ -254,12 +255,14 @@ namespace FreeSql.Internal.CommonProvider
if (members.Any() == false) if (members.Any() == false)
{ {
ParseExpMapResult = insideData.InsideMap; ParseExpMapResult = insideData.InsideMap;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
return $"{ParseExpMatchedTable.Alias}.{insideData.InsideMap.DbNestedField}"; return $"{ParseExpMatchedTable.Alias}.{insideData.InsideMap.DbNestedField}";
} }
var read = insideData.InsideMap; var read = insideData.InsideMap;
if (members.Length == 1 && members[0] == ParseExpMatchedTable.Parameter) if (members.Length == 1 && members[0] == ParseExpMatchedTable.Parameter)
{ {
ParseExpMapResult = read; ParseExpMapResult = read;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}"; return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";
} }
for (var a = members[0] == ParseExpMatchedTable.Parameter ? 1 : 0; a < members.Length; a++) for (var a = members[0] == ParseExpMatchedTable.Parameter ? 1 : 0; a < members.Length; a++)
@@ -268,6 +271,7 @@ namespace FreeSql.Internal.CommonProvider
if (read == null) return null; if (read == null) return null;
} }
ParseExpMapResult = read; ParseExpMapResult = read;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}"; return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";
} }
public SelectTableInfo GetOutsideSelectTable(ParameterExpression parameterExp) public SelectTableInfo GetOutsideSelectTable(ParameterExpression parameterExp)

15
FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
View File

@@ -36,9 +36,11 @@ namespace FreeSql.Internal.CommonProvider
public override string ParseExp(Expression[] members) public override string ParseExp(Expression[] members)
{ {
ParseExpMapResult = null; ParseExpMapResult = null;
ParseExpColumnResult = null;
if (members.Any() == false) if (members.Any() == false)
{ {
ParseExpMapResult = _map; ParseExpMapResult = _map;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
return _map.DbField; return _map.DbField;
} }
var firstMember = ((members.FirstOrDefault() as MemberExpression)?.Expression as MemberExpression); var firstMember = ((members.FirstOrDefault() as MemberExpression)?.Expression as MemberExpression);
@@ -53,6 +55,7 @@ namespace FreeSql.Internal.CommonProvider
if (read == null) return null; if (read == null) return null;
} }
ParseExpMapResult = read; ParseExpMapResult = read;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
if (!_addFieldAlias) return read.DbField; if (!_addFieldAlias) return read.DbField;
if (_flagNestedFieldAlias) return read.DbField; if (_flagNestedFieldAlias) return read.DbField;
if (_comonExp.EndsWithDbNestedField(read.DbField, read.DbNestedField) == false) if (_comonExp.EndsWithDbNestedField(read.DbField, read.DbNestedField) == false)
@@ -82,6 +85,7 @@ namespace FreeSql.Internal.CommonProvider
members[a] = replaceVistor.Modify(members[a], replaceMember, curtable.Parameter); members[a] = replaceVistor.Modify(members[a], replaceMember, curtable.Parameter);
var ret = _select._diymemexpWithTempQuery.ParseExp(members); var ret = _select._diymemexpWithTempQuery.ParseExp(members);
ParseExpMapResult = _select._diymemexpWithTempQuery.ParseExpMapResult; ParseExpMapResult = _select._diymemexpWithTempQuery.ParseExpMapResult;
ParseExpColumnResult = ParseExpMapResult.GetColumn();
return ret; return ret;
} }
} }
@@ -132,16 +136,7 @@ namespace FreeSql.Internal.CommonProvider
} }
var tsc = new CommonExpression.ExpTSC { _tables = _tables, _tableRule = _select._tableRule, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = true, style = CommonExpression.ExpressionStyle.Where }; var tsc = new CommonExpression.ExpTSC { _tables = _tables, _tableRule = _select._tableRule, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = true, style = CommonExpression.ExpressionStyle.Where };
var result = _comonExp.ExpressionLambdaToSql(retExp, tsc); var result = _comonExp.ExpressionLambdaToSql(retExp, tsc);
//ParseExpMapResult = result ParseExpColumnResult = tsc.mapColumnTmp;
if (tsc.mapColumnTmp != null)
ParseExpMapResult = new ReadAnonymousTypeInfo
{
Property = tsc.mapColumnTmp.Table.Properties[tsc.mapColumnTmp.CsName],
CsName = tsc.mapColumnTmp.CsName,
CsType = tsc.mapColumnTmp.CsType, //dtoProp.PropertyType,
MapType = tsc.mapColumnTmp.Attribute.MapType,
Table = tsc.mapColumnTmp.Table
};
return result; return result;
} }
return null; return null;

6
FreeSql/Internal/Model/ReadAnonymousTypeInfo.cs
View File

@@ -25,6 +25,12 @@ namespace FreeSql.Internal.Model
public string IncludeManyKey { get; set; } //ToList(a => new { a.Childs }) 集合属性指定加载 public string IncludeManyKey { get; set; } //ToList(a => new { a.Childs }) 集合属性指定加载
public Expression SubSelectMany { get; set; } //ToList(a => new { sublist = fsql.Select<T>().ToList() }) 子集合查询 public Expression SubSelectMany { get; set; } //ToList(a => new { sublist = fsql.Select<T>().ToList() }) 子集合查询
public ColumnInfo GetColumn()
{
if (Childs.Any() == false && Table != null && CsName != null && Table.ColumnsByCs.TryGetValue(CsName, out var pcol)) return pcol;
return null;
}
public void CopyTo(ReadAnonymousTypeInfo target) public void CopyTo(ReadAnonymousTypeInfo target)
{ {
target.Property = Property; target.Property = Property;