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

v3.2.666-preview20220615

Browse Source
This commit is contained in:
2881099 2022-06-15 10:41:39 +08:00
parent c7335492eb
commit 26115cfc93
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Version>3.2.666-preview20220614</Version> <Version>3.2.666-preview20220615</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

8
FreeSql/FreeSql.xml
View File

@ -5291,12 +5291,12 @@
</member> </member>
<member name="P:FreeSql.CoreStrings.S_ConnectionStringError_CheckProject"> <member name="P:FreeSql.CoreStrings.S_ConnectionStringError_CheckProject">
<summary> <summary>
连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64 连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台
</summary> </summary>
</member> </member>
<member name="M:FreeSql.CoreStrings.S_ConnectionStringError_CheckProjectConnection(System.Object)"> <member name="M:FreeSql.CoreStrings.S_ConnectionStringError_CheckProjectConnection(System.Object)">
<summary> <summary>
【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64 【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台
</summary> </summary>
</member> </member>
<member name="P:FreeSql.CoreStrings.S_CustomAdapter_Cannot_Use_CreateCommand"> <member name="P:FreeSql.CoreStrings.S_CustomAdapter_Cannot_Use_CreateCommand">
@ -5326,7 +5326,7 @@
</member> </member>
<member name="M:FreeSql.CoreStrings.S_DB_ParameterError_UnsupportedType(System.Object)"> <member name="M:FreeSql.CoreStrings.S_DB_ParameterError_UnsupportedType(System.Object)">
<summary> <summary>
-DB 参数错误，不支持的类型：\"{dbargs}\" -DB 参数错误，不支持的类型："{dbargs}"
</summary> </summary>
</member> </member>
<member name="M:FreeSql.CoreStrings.S_Features_Unique(System.Object,System.Object)"> <member name="M:FreeSql.CoreStrings.S_Features_Unique(System.Object,System.Object)">
@ -5346,7 +5346,7 @@
</member> </member>
<member name="M:FreeSql.CoreStrings.S_MygisGeometry_NotImplement(System.Object)"> <member name="M:FreeSql.CoreStrings.S_MygisGeometry_NotImplement(System.Object)">
<summary> <summary>
MygisGeometry.Parse 未实现 \"{wkt}\" MygisGeometry.Parse 未实现 "{wkt}"
</summary> </summary>
</member> </member>
<member name="P:FreeSql.CoreStrings.S_NameOptions_Incorrect"> <member name="P:FreeSql.CoreStrings.S_NameOptions_Incorrect">

15
FreeSql/Properties/CoreStrings.Designer.cs generated
View File

@ -1,8 +1,11 @@
 
// <auto-generated /> // <auto-generated />
using System.Globalization; using System;
using System.Reflection;
using System.Resources; using System.Resources;
using System.Globalization;
using System.Threading;
namespace FreeSql namespace FreeSql
{ {
@ -906,13 +909,13 @@ namespace FreeSql
thisName); thisName);
/// <summary> /// <summary>
/// 连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64 /// 连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台
/// </summary> /// </summary>
public static string S_ConnectionStringError_CheckProject public static string S_ConnectionStringError_CheckProject
=> GetString("S_ConnectionStringError_CheckProject "); => GetString("S_ConnectionStringError_CheckProject");
/// <summary> /// <summary>
/// 【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64 /// 【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台
/// </summary> /// </summary>
public static string S_ConnectionStringError_CheckProjectConnection(object thisName) public static string S_ConnectionStringError_CheckProjectConnection(object thisName)
=> string.Format( => string.Format(
@ -952,7 +955,7 @@ namespace FreeSql
=> GetString("S_DB_ParameterError"); => GetString("S_DB_ParameterError");
/// <summary> /// <summary>
/// -DB 参数错误，不支持的类型：\"{dbargs}\" /// -DB 参数错误，不支持的类型："{dbargs}"
/// </summary> /// </summary>
public static string S_DB_ParameterError_UnsupportedType(object dbargs) public static string S_DB_ParameterError_UnsupportedType(object dbargs)
=> string.Format( => string.Format(
@ -980,7 +983,7 @@ namespace FreeSql
=> GetString("S_MasterDatabase"); => GetString("S_MasterDatabase");
/// <summary> /// <summary>
/// MygisGeometry.Parse 未实现 \"{wkt}\" /// MygisGeometry.Parse 未实现 "{wkt}"
/// </summary> /// </summary>
public static string S_MygisGeometry_NotImplement(object wkt) public static string S_MygisGeometry_NotImplement(object wkt)
=> string.Format( => string.Format(

6
FreeSql/Properties/CoreStrings.resx
View File

@ -522,11 +522,11 @@
<data name="S_ConnectionStringError_Check" xml:space="preserve"> <data name="S_ConnectionStringError_Check" xml:space="preserve">
<value>FreeSql:[{thisName}] Connection string error, please check.</value> <value>FreeSql:[{thisName}] Connection string error, please check.</value>
</data> </data>
<data name="S_ConnectionStringError_CheckProject " xml:space="preserve"> <data name="S_ConnectionStringError_CheckProject" xml:space="preserve">
<value>FreeSql:Connection string error, or check project properties &gt; Build &gt; Target Platform: x86 | x64</value> <value>FreeSql:Connection string error, or check project properties &gt; Build &gt; Target Platform: x86 | x64, Or use FreeSql.Provider.SqliteCore accessing arm platform</value>
</data> </data>
<data name="S_ConnectionStringError_CheckProjectConnection" xml:space="preserve"> <data name="S_ConnectionStringError_CheckProjectConnection" xml:space="preserve">
<value>FreeSql:[{thisName}] Connection string error, please check. Or check Project Properties &gt; Build &gt; Target Platform: x86 | x64</value> <value>FreeSql:[{thisName}] Connection string error, please check. Or check Project Properties &gt; Build &gt; Target Platform: x86 | x64, Or use FreeSql.Provider.SqliteCore accessing arm platform</value>
</data> </data>
<data name="S_CustomAdapter_Cannot_Use_CreateCommand" xml:space="preserve"> <data name="S_CustomAdapter_Cannot_Use_CreateCommand" xml:space="preserve">
<value>FreeSql:FreeSql.Provider.CustomAdapter cannot use CreateCommand</value> <value>FreeSql:FreeSql.Provider.CustomAdapter cannot use CreateCommand</value>

6
FreeSql/Properties/CoreStrings.zh-Hans.resx
View File

@ -474,12 +474,12 @@
<value>【{thisName}】连接字符串错误，请检查。</value> <value>【{thisName}】连接字符串错误，请检查。</value>
<comment>Providers</comment> <comment>Providers</comment>
</data> </data>
<data name="S_ConnectionStringError_CheckProject " xml:space="preserve"> <data name="S_ConnectionStringError_CheckProject" xml:space="preserve">
<value>连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64</value> <value>连接字符串错误，或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台</value>
<comment>Providers</comment> <comment>Providers</comment>
</data> </data>
<data name="S_ConnectionStringError_CheckProjectConnection" xml:space="preserve"> <data name="S_ConnectionStringError_CheckProjectConnection" xml:space="preserve">
<value>【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64</value> <value>【{thisName}】连接字符串错误，请检查。或者检查项目属性 &gt; 生成 &gt; 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台</value>
<comment>Providers</comment> <comment>Providers</comment>
</data> </data>
<data name="S_CustomAdapter_Cannot_Use_CreateCommand" xml:space="preserve"> <data name="S_CustomAdapter_Cannot_Use_CreateCommand" xml:space="preserve">

4
Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
View File

@ -160,8 +160,8 @@ namespace FreeSql.Sqlite
{ {
if (obj.Value == null) if (obj.Value == null)
{ {
_pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), obj.LastGetTimeCopy); _pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError_CheckProject), obj.LastGetTimeCopy);
throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name)); throw new Exception(CoreStrings.S_ConnectionStringError_CheckProjectConnection(this.Name));
} }
if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false) if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false)