Merge branch 'master' of https://github.com/dotnetcore/FreeSql

Author: 2881099

Directory.Build.props

@@ -12,7 +12,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 	</PropertyGroup>
 	-->
 

Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs

@@ -538,8 +538,9 @@ NativeTuple<string, ColumnInfo, string> ParseField(ZeroTableInfo firstTable, str
 			{
 				if (string.IsNullOrEmpty(property)) return null;
 				var field = property.Split('.').Select(a => a.Trim()).ToArray();
-
-				if (field.Length == 1)
+				var fieldCopy = field.ToArray();
+				if (fieldCopy.Length == 3) field = new[] { string.Join(".", field.Take(field.Length - 1)), field[2] };
+                if (field.Length == 1)
 				{
 					if (firstTable != null && firstTable.ColumnsByCs.TryGetValue(field[0], out var col2) == true)
 						return NativeTuple.Create($"{firstTableAlias}.{_common.QuoteSqlName(col2.Attribute.Name)}", col2, firstTableAlias);
@@ -566,8 +567,9 @@ NativeTuple<string, ColumnInfo, string> ParseField(ZeroTableInfo firstTable, str
 					}
 					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, field[0]);
+					if (fieldCopy.Length == 3) field = fieldCopy.ToArray();
 				}
-
+				
 				var navPath = string.Join(".", field.Skip(1).Take(field.Length - 1));
 				var ta = _tableAlias.Where(a => string.Join(".", a.NavPath) == navPath).FirstOrDefault();
 				if (ta?.Table.ColumnsByCs.TryGetValue(field.Last(), out var col) == true)
@@ -717,7 +719,7 @@ public SelectImpl WhereDynamicFilter(DynamicFilterInfo filter)
 			string ParseDynamicFilter(DynamicFilterInfo filter)
 			{
 				var replacedFilter = new DynamicFilterInfo();
-				var replacedMap = new List<NativeTuple<string, string, string>>();
+				var replacedMap = new List<NativeTuple<string, string, string, DynamicFilterInfo>>();
 				LocalCloneFilter(filter, replacedFilter);
 				var oldWhere = _selectProvider._where.ToString();
 				var newWhere = "";
@@ -734,14 +736,13 @@ string ParseDynamicFilter(DynamicFilterInfo filter)
 				foreach (var rm in replacedMap)
 				{
 					var find = $"{_selectProvider._tables[0].Alias}.{_common.QuoteSqlName(rm.Item1)}";
-					while (true)
+					var forend = rm.Item4.Operator == DynamicFilterOperator.DateRange ||
+						rm.Item4.Operator == DynamicFilterOperator.Range ? 2 : 1;
+                    for (var forstart = 0; forstart < forend; forstart++)
 					{
-						var idx = newWhere.IndexOf(find);
-						if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]"))
-							newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
-						else
-							break;
-					}
+                        var idx = newWhere.IndexOf(find);
+                        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;
 
@@ -760,7 +761,7 @@ void LocalCloneFilter(DynamicFilterInfo source, DynamicFilterInfo target)
 								target.Field = pname;
 							else
 								target.Field = TestDynamicFilterInfo._dictTypeToPropertyname[typeof(string)];
-							replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1, parseResult.Item3));
+							replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1, parseResult.Item3, source));
 						}
 					}
 					if (source.Filters?.Any() == true)

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.5.213</Version>
+		<Version>3.5.215-preview20250917</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>