tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge main branches

Browse Source
This commit is contained in:
igeekfan
2022-05-20 03:16:13 +08:00
parent ba2582b8d1 376862c1bd
commit 747603dbb6
121 changed files with 1110 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
View File

@ -90,9 +90,11 @@ namespace FreeSql.SqlServer.Curd
}
foreach (var tb in tbsjoin)
{
if (tb.Type == SelectTableInfoType.Parent) continue;
switch (tb.Type)
{
case SelectTableInfoType.Parent:
case SelectTableInfoType.RawJoin:
continue;
case SelectTableInfoType.LeftJoin:
sb.Append(" \r\nLEFT JOIN ");
break;
@ -195,9 +197,11 @@ namespace FreeSql.SqlServer.Curd
}
foreach (var tb in tbsjoin)
{
if (tb.Type == SelectTableInfoType.Parent) continue;
switch (tb.Type)
{
case SelectTableInfoType.Parent:
case SelectTableInfoType.RawJoin:
continue;
case SelectTableInfoType.LeftJoin:
sb.Append(" \r\nLEFT JOIN ");
break;

2
Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
View File

@ -28,7 +28,7 @@
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net60' or '$(TargetFramework)' == 'net50'">
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.4" />
</ItemGroup>
<ItemGroup>

4
Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
View File

@ -144,7 +144,7 @@ namespace FreeSql.SqlServer
catch (Exception ex)
{
if (_pool.SetUnavailable(ex) == true)
throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}");
}
}
}
@ -174,7 +174,7 @@ namespace FreeSql.SqlServer
catch (Exception ex)
{
if (_pool.SetUnavailable(ex) == true)
throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}");
}
}
}