mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 01:05:27 +08:00 
			
		
		
		
	Merge branch 'dotnetcore:master' into master
This commit is contained in:
		@@ -11,7 +11,7 @@
 | 
				
			|||||||
	<!--
 | 
						<!--
 | 
				
			||||||
	经常出于版本交叉问题,暂时关闭,在每个项目上设置版本号
 | 
						经常出于版本交叉问题,暂时关闭,在每个项目上设置版本号
 | 
				
			||||||
	<PropertyGroup>
 | 
						<PropertyGroup>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
	-->
 | 
						-->
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<LangVersion>latest</LangVersion>
 | 
							<LangVersion>latest</LangVersion>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
		<Title>$(AssemblyName)</Title>
 | 
							<Title>$(AssemblyName)</Title>
 | 
				
			||||||
		<IsPackable>true</IsPackable>
 | 
							<IsPackable>true</IsPackable>
 | 
				
			||||||
		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
							<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@
 | 
				
			|||||||
		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 | 
							<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 | 
				
			||||||
		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 | 
							<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 | 
				
			||||||
		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
 | 
							<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
		<SignAssembly>False</SignAssembly>
 | 
							<SignAssembly>False</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -90,7 +90,7 @@ namespace FreeSql.Custom.SqlServer
 | 
				
			|||||||
			foreach (var pk in primarys)
 | 
								foreach (var pk in primarys)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
									if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
				
			||||||
				caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar)");
 | 
									caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar(2000))");
 | 
				
			||||||
				++pkidx;
 | 
									++pkidx;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			caseWhen.Append(")");
 | 
								caseWhen.Append(")");
 | 
				
			||||||
@@ -107,7 +107,7 @@ namespace FreeSql.Custom.SqlServer
 | 
				
			|||||||
			foreach (var pk in primarys)
 | 
								foreach (var pk in primarys)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				if (pkidx > 0) sb.Append(" + '+' + ");
 | 
									if (pkidx > 0) sb.Append(" + '+' + ");
 | 
				
			||||||
				sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar)");
 | 
									sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar(2000))");
 | 
				
			||||||
				++pkidx;
 | 
									++pkidx;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
		<Title>$(AssemblyName)</Title>
 | 
							<Title>$(AssemblyName)</Title>
 | 
				
			||||||
		<IsPackable>true</IsPackable>
 | 
							<IsPackable>true</IsPackable>
 | 
				
			||||||
		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
							<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
		<Title>$(AssemblyName)</Title>
 | 
							<Title>$(AssemblyName)</Title>
 | 
				
			||||||
		<IsPackable>true</IsPackable>
 | 
							<IsPackable>true</IsPackable>
 | 
				
			||||||
		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
							<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -90,7 +90,7 @@ namespace FreeSql.Odbc.SqlServer
 | 
				
			|||||||
			foreach (var pk in primarys)
 | 
								foreach (var pk in primarys)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
									if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
				
			||||||
				caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar)");
 | 
									caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar(2000))");
 | 
				
			||||||
				++pkidx;
 | 
									++pkidx;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			caseWhen.Append(")");
 | 
								caseWhen.Append(")");
 | 
				
			||||||
@@ -107,7 +107,7 @@ namespace FreeSql.Odbc.SqlServer
 | 
				
			|||||||
			foreach (var pk in primarys)
 | 
								foreach (var pk in primarys)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				if (pkidx > 0) sb.Append(" + '+' + ");
 | 
									if (pkidx > 0) sb.Append(" + '+' + ");
 | 
				
			||||||
				sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar)");
 | 
									sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar(2000))");
 | 
				
			||||||
				++pkidx;
 | 
									++pkidx;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
		<Title>$(AssemblyName)</Title>
 | 
							<Title>$(AssemblyName)</Title>
 | 
				
			||||||
		<IsPackable>true</IsPackable>
 | 
							<IsPackable>true</IsPackable>
 | 
				
			||||||
		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
							<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -90,7 +90,7 @@ namespace FreeSql.SqlServer.Curd
 | 
				
			|||||||
            foreach (var pk in primarys)
 | 
					            foreach (var pk in primarys)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
					                if (pkidx > 0) caseWhen.Append(" + '+' + ");
 | 
				
			||||||
                caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar)");
 | 
					                caseWhen.Append("cast(").Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name))).Append(" as varchar(2000))");
 | 
				
			||||||
                ++pkidx;
 | 
					                ++pkidx;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            caseWhen.Append(")");
 | 
					            caseWhen.Append(")");
 | 
				
			||||||
@@ -107,7 +107,7 @@ namespace FreeSql.SqlServer.Curd
 | 
				
			|||||||
            foreach (var pk in primarys)
 | 
					            foreach (var pk in primarys)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (pkidx > 0) sb.Append(" + '+' + ");
 | 
					                if (pkidx > 0) sb.Append(" + '+' + ");
 | 
				
			||||||
                sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar)");
 | 
					                sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d))).Append(" as varchar(2000))");
 | 
				
			||||||
                ++pkidx;
 | 
					                ++pkidx;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
		<SignAssembly>true</SignAssembly>
 | 
							<SignAssembly>true</SignAssembly>
 | 
				
			||||||
		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
							<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
		<DelaySign>false</DelaySign>
 | 
							<DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
        <SignAssembly>true</SignAssembly>
 | 
					        <SignAssembly>true</SignAssembly>
 | 
				
			||||||
        <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
					        <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 | 
				
			||||||
        <DelaySign>false</DelaySign>
 | 
					        <DelaySign>false</DelaySign>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
		<Title>$(AssemblyName)</Title>
 | 
							<Title>$(AssemblyName)</Title>
 | 
				
			||||||
		<IsPackable>true</IsPackable>
 | 
							<IsPackable>true</IsPackable>
 | 
				
			||||||
		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
							<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 | 
				
			||||||
		<Version>3.2.816-preview20240314</Version>
 | 
							<Version>3.2.816-preview20240322</Version>
 | 
				
			||||||
		<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
							<PackageReadmeFile>readme.md</PackageReadmeFile>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user