diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs index 55ea7502..9ac8cfda 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs +++ b/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 && diff --git a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs b/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs index 6fd2e857..0f55c5eb 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs +++ b/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} "; diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj index 627088fb..ffb08221 100644 --- a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj +++ b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj @@ -1,7 +1,7 @@  - netcoreapp31;netstandard2.0;net45;net40 + netcoreapp3.1;netstandard2.0;net45;net40 true FreeSql;ncc;YeXiangQin FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider) @@ -21,14 +21,19 @@ - - + + Always + + + + + @@ -47,5 +52,6 @@ net40 + diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.11058.nuspec b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.11058.nuspec new file mode 100644 index 00000000..ed0414f4 --- /dev/null +++ b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.11058.nuspec @@ -0,0 +1,28 @@ + + + + DmProvider + 1.1.0.11058 + DM + false + DM .NET PROVIDER + Copy right(C) DM + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.nuspec b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.nuspec deleted file mode 100644 index 52b9ed57..00000000 --- a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - DmProvider - 1.1.0 - DM - DM - false - DM .NET PROVIDER - Copy right(C) DM - - - - - - - - - - - \ No newline at end of file diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll index a66f4386..40eba0db 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll index 4d167724..a0430be3 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll index 96e6f539..cc4af248 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll new file mode 100644 index 00000000..610cc965 Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll new file mode 100644 index 00000000..2879b355 Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll new file mode 100644 index 00000000..e91f3858 Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll new file mode 100644 index 00000000..c1ff52fd Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll new file mode 100644 index 00000000..8691aa78 Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll new file mode 100644 index 00000000..bfe92616 Binary files /dev/null and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/DmProvider.dll deleted file mode 100644 index 7f92f586..00000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/en/DmProvider.resources.dll deleted file mode 100644 index 93f83654..00000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 0777d47d..00000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp31/zh-CN/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll index d4db93cf..06a53c76 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll index cb0e9488..76efbd19 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll index fcd77075..4e46b23f 100644 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll and b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll differ