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

2881099 · 2881099 · commit 2a2be549868c · 2024-01-26T19:33:49.000+08:00
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests/Issues/1237.cs b/FreeSql.Tests/FreeSql.Tests/Issues/1237.cs
@@ -36,11 +36,11 @@ GROUP BY replace(replace(a.""Name"", ' ', ''), '　', '')
                 .ToSql();
             Assert.Equal(@"SELECT * 
 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 
     GROUP BY replace(replace(a.""Name"", ' ', ''), '　', ''), a.""CSNY"" 
     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);
 
         }
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -26,6 +26,7 @@ public abstract class BaseDiyMemberExpression
         public ReadAnonymousTypeInfo _map;
         public string _field;
         public ReadAnonymousTypeInfo ParseExpMapResult { get; internal protected set; }
+        public ColumnInfo ParseExpColumnResult { get; internal protected set; }
         public abstract string ParseExp(Expression[] members);
     }
 
@@ -859,10 +860,10 @@ rightExp is UnaryExpression rightExpUexp &&
             }
 
             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 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);
             ColumnInfo rightMapColumn = null;
             var isRightMapType = false;
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -241,6 +241,7 @@ public WithTempQueryParser Append(Select0Provider select, SelectTableInfo outsid
             public override string ParseExp(Expression[] members)
             {
                 ParseExpMapResult = null;
+                ParseExpColumnResult = null;
                 ParseExpMatchedTable = GetOutsideSelectTable(members.FirstOrDefault()?.GetParameter());
                 if (ParseExpMatchedTable == null) return null;
 
@@ -254,12 +255,14 @@ public override string ParseExp(Expression[] members)
                 if (members.Any() == false)
                 {
                     ParseExpMapResult = insideData.InsideMap;
+                    ParseExpColumnResult = ParseExpMapResult.GetColumn();
                     return $"{ParseExpMatchedTable.Alias}.{insideData.InsideMap.DbNestedField}";
                 }
                 var read = insideData.InsideMap;
                 if (members.Length == 1 && members[0] == ParseExpMatchedTable.Parameter)
                 {
                     ParseExpMapResult = read;
+                    ParseExpColumnResult = ParseExpMapResult.GetColumn();
                     return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";
                 }
                 for (var a = members[0] == ParseExpMatchedTable.Parameter ? 1 : 0; a < members.Length; a++)
@@ -268,6 +271,7 @@ public override string ParseExp(Expression[] members)
                     if (read == null) return null;
                 }
                 ParseExpMapResult = read;
+                ParseExpColumnResult = ParseExpMapResult.GetColumn();
                 return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";
             }
             public SelectTableInfo GetOutsideSelectTable(ParameterExpression parameterExp)
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
@@ -36,9 +36,11 @@ public SelectGroupingProvider(IFreeSql orm, Select0Provider select, ReadAnonymou
         public override string ParseExp(Expression[] members)
         {
             ParseExpMapResult = null;
+            ParseExpColumnResult = null;
             if (members.Any() == false)
             {
                 ParseExpMapResult = _map;
+                ParseExpColumnResult = ParseExpMapResult.GetColumn();
                 return _map.DbField;
             }
             var firstMember = ((members.FirstOrDefault() as MemberExpression)?.Expression as MemberExpression);
@@ -53,6 +55,7 @@ public override string ParseExp(Expression[] members)
                         if (read == null) return null;
                     }
                     ParseExpMapResult = read;
+                    ParseExpColumnResult = ParseExpMapResult.GetColumn();
                     if (!_addFieldAlias) return read.DbField;
                     if (_flagNestedFieldAlias) return read.DbField;
                     if (_comonExp.EndsWithDbNestedField(read.DbField, read.DbNestedField) == false)
@@ -82,6 +85,7 @@ public override string ParseExp(Expression[] members)
                                 members[a] = replaceVistor.Modify(members[a], replaceMember, curtable.Parameter);
                             var ret = _select._diymemexpWithTempQuery.ParseExp(members);
                             ParseExpMapResult = _select._diymemexpWithTempQuery.ParseExpMapResult;
+                            ParseExpColumnResult = ParseExpMapResult.GetColumn();
                             return ret;
                         }
                     }
@@ -132,16 +136,7 @@ void LocalValueInitData()
                     }
                     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);
-                    //ParseExpMapResult = result
-                    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
-                        };
+                    ParseExpColumnResult = tsc.mapColumnTmp;
                     return result;
             }
             return null;
diff --git a/FreeSql/Internal/Model/ReadAnonymousTypeInfo.cs b/FreeSql/Internal/Model/ReadAnonymousTypeInfo.cs
@@ -25,6 +25,12 @@ public class ReadAnonymousTypeInfo
         public string IncludeManyKey { get; set; } //ToList(a => new { a.Childs }) 集合属性指定加载
         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)
         {
             target.Property = Property;

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ public WithTempQueryParser Append(Select0Provider select, SelectTableInfo outsid`
`241`	`241`	`public override string ParseExp(Expression[] members)`
`242`	`242`	`{`
`243`	`243`	`ParseExpMapResult = null;`
	`244`	`+ ParseExpColumnResult = null;`
`244`	`245`	`ParseExpMatchedTable = GetOutsideSelectTable(members.FirstOrDefault()?.GetParameter());`
`245`	`246`	`if (ParseExpMatchedTable == null) return null;`
`246`	`247`
`@@ -254,12 +255,14 @@ public override string ParseExp(Expression[] members)`
`254`	`255`	`if (members.Any() == false)`
`255`	`256`	`{`
`256`	`257`	`ParseExpMapResult = insideData.InsideMap;`
	`258`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`257`	`259`	`return $"{ParseExpMatchedTable.Alias}.{insideData.InsideMap.DbNestedField}";`
`258`	`260`	`}`
`259`	`261`	`var read = insideData.InsideMap;`
`260`	`262`	`if (members.Length == 1 && members[0] == ParseExpMatchedTable.Parameter)`
`261`	`263`	`{`
`262`	`264`	`ParseExpMapResult = read;`
	`265`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`263`	`266`	`return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";`
`264`	`267`	`}`
`265`	`268`	`for (var a = members[0] == ParseExpMatchedTable.Parameter ? 1 : 0; a < members.Length; a++)`
`@@ -268,6 +271,7 @@ public override string ParseExp(Expression[] members)`
`268`	`271`	`if (read == null) return null;`
`269`	`272`	`}`
`270`	`273`	`ParseExpMapResult = read;`
	`274`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`271`	`275`	`return $"{ParseExpMatchedTable.Alias}.{read.DbNestedField}";`
`272`	`276`	`}`
`273`	`277`	`public SelectTableInfo GetOutsideSelectTable(ParameterExpression parameterExp)`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,11 @@ public SelectGroupingProvider(IFreeSql orm, Select0Provider select, ReadAnonymou`
`36`	`36`	`public override string ParseExp(Expression[] members)`
`37`	`37`	`{`
`38`	`38`	`ParseExpMapResult = null;`
	`39`	`+ ParseExpColumnResult = null;`
`39`	`40`	`if (members.Any() == false)`
`40`	`41`	`{`
`41`	`42`	`ParseExpMapResult = _map;`
	`43`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`42`	`44`	`return _map.DbField;`
`43`	`45`	`}`
`44`	`46`	`var firstMember = ((members.FirstOrDefault() as MemberExpression)?.Expression as MemberExpression);`
`@@ -53,6 +55,7 @@ public override string ParseExp(Expression[] members)`
`53`	`55`	`if (read == null) return null;`
`54`	`56`	`}`
`55`	`57`	`ParseExpMapResult = read;`
	`58`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`56`	`59`	`if (!_addFieldAlias) return read.DbField;`
`57`	`60`	`if (_flagNestedFieldAlias) return read.DbField;`
`58`	`61`	`if (_comonExp.EndsWithDbNestedField(read.DbField, read.DbNestedField) == false)`
`@@ -82,6 +85,7 @@ public override string ParseExp(Expression[] members)`
`82`	`85`	`members[a] = replaceVistor.Modify(members[a], replaceMember, curtable.Parameter);`
`83`	`86`	`var ret = _select._diymemexpWithTempQuery.ParseExp(members);`
`84`	`87`	`ParseExpMapResult = _select._diymemexpWithTempQuery.ParseExpMapResult;`
	`88`	`+ ParseExpColumnResult = ParseExpMapResult.GetColumn();`
`85`	`89`	`return ret;`
`86`	`90`	`}`
`87`	`91`	`}`
`@@ -132,16 +136,7 @@ void LocalValueInitData()`
`132`	`136`	`}`
`133`	`137`	`var tsc = new CommonExpression.ExpTSC { _tables = _tables, _tableRule = _select._tableRule, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = true, style = CommonExpression.ExpressionStyle.Where };`
`134`	`138`	`var result = _comonExp.ExpressionLambdaToSql(retExp, tsc);`
`135`		`- //ParseExpMapResult = result`
`136`		`- if (tsc.mapColumnTmp != null)`
`137`		`- ParseExpMapResult = new ReadAnonymousTypeInfo`
`138`		`- {`
`139`		`- Property = tsc.mapColumnTmp.Table.Properties[tsc.mapColumnTmp.CsName],`
`140`		`- CsName = tsc.mapColumnTmp.CsName,`
`141`		`- CsType = tsc.mapColumnTmp.CsType, //dtoProp.PropertyType,`
`142`		`- MapType = tsc.mapColumnTmp.Attribute.MapType,`
`143`		`- Table = tsc.mapColumnTmp.Table`
`144`		`- };`
	`139`	`+ ParseExpColumnResult = tsc.mapColumnTmp;`
`145`	`140`	`return result;`
`146`	`141`	`}`
`147`	`142`	`return null;`