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

FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs

@@ -632,7 +632,7 @@ namespace FreeSql.Internal.CommonProvider
                             a.Alias.StartsWith($"{tb.Alias}__") && //开头结尾完全匹配
                             a.Alias.EndsWith($"__{prop.Name}") //不清楚会不会有其他情况 求大佬优化
                             ).FirstOrDefault(); //判断 b > 0 防止 parent 递归关系
-                        if (tb2 == null && props.Where(pw => pw.Value.PropertyType == prop.PropertyType).Count() == 1)
+                        if (tb2 == null && props.Where(pw => pw.Value.PropertyType == prop.PropertyType).Take(2).Count() == 1)
                             tb2 = _tables.Where((a, b) => b > 0 &&
                                 (a.Type == SelectTableInfoType.InnerJoin || a.Type == SelectTableInfoType.LeftJoin || a.Type == SelectTableInfoType.RightJoin) &&
                                 string.IsNullOrEmpty(a.On) == false &&

Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs

@@ -356,7 +356,7 @@ case when a.nullable = 'N' then 0 else 1 end,
 nvl((select 1 from user_sequences where upper(sequence_name)=upper(a.table_name||'_seq_'||a.column_name) and rownum < 2), 0),
 b.comments,
 a.data_default
-from all_tab_cols a
+from all_tab_columns a
 left join all_col_comments b on b.owner = a.owner and b.table_name = a.table_name and b.column_name = a.column_name
 where {(ignoreCase ? "lower(a.owner)" : "a.owner")} in ({databaseIn}) and {loc8}
 ";

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp31;netstandard2.0;net45;net40</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;netstandard2.0;net45;net40</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider)</Description>
@@ -21,14 +21,19 @@
 	<ItemGroup>
 		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 		<None Include="lib\DmProvider\netstandard2.0\DmProvider.dll" Pack="true" PackagePath="\lib\netstandard2.0\" />
-		<None Include="lib\DmProvider\netcoreapp31\DmProvider.dll" Pack="true" PackagePath="\lib\netcoreapp31\" />
+		<None Include="lib\DmProvider\netcoreapp3.1\DmProvider.dll" Pack="true" PackagePath="\lib\netcoreapp3.1\" />
-		<None Include="lib\DmProvider\net40\DmProvider.dll" Pack="true" PackagePath="\lib\net45\" />
+		<None Include="lib\DmProvider\net45\DmProvider.dll" Pack="true" PackagePath="\lib\net45\" />
 		<None Include="lib\DmProvider\net40\DmProvider.dll" Pack="true" PackagePath="\lib\net40\" />
 		<None Include="lib/**/*.dll">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
 	</ItemGroup>
@@ -47,5 +52,6 @@
 		<DefineConstants>net40</DefineConstants>
 	</PropertyGroup>
 
+
 </Project>
 

Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.11058.nuspec

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>DmProvider</id>
+    <version>1.1.0.11058</version>
+    <authors>DM</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>DM .NET PROVIDER</description>
+    <copyright>Copy right(C) DM</copyright>
+    <dependencies>
+      <group targetFramework=".NETFramework4.0" />
+      <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETCoreApp2.0">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework=".NETCoreApp3.1">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="net5.0" />
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Transactions.dll" targetFramework=".NETFramework4.0, .NETFramework4.5" />
+    </frameworkAssemblies>
+  </metadata>
+</package>

Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.nuspec

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>DmProvider</id>
-    <version>1.1.0</version>
-    <authors>DM</authors>
-    <owners>DM</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>DM .NET PROVIDER</description>
-    <copyright>Copy right(C) DM</copyright>
-    <dependencies>
-      <group targetFramework=".NETFramework2.0" />
-      <group targetFramework=".NETStandard2.0">
-        <dependency id="System.Text.Encoding.CodePages" version="4.4.0" exclude="Build,Analyzers" />
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Transactions" targetFramework=".NETFramework2.0" />
-    </frameworkAssemblies>
-  </metadata>
-</package>