From aee82f9caa6ba4516cf339e01d34bf00ef499a00 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Sat, 8 Aug 2020 16:30:44 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20SqlServerProvider=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql.DbContext/FreeSql.DbContext.xml | 9 --------- .../SqlServer/OdbcSqlServerProvider.cs | 10 +++++----- .../FreeSql.Provider.SqlServer/SqlServerProvider.cs | 10 +++++----- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 2acb6679..c46aa1e3 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -527,14 +527,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs index ffe9ad80..d1e6aab7 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs @@ -41,15 +41,15 @@ namespace FreeSql.Odbc.SqlServer this.CodeFirst = new OdbcSqlServerCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression); if (this.Ado.MasterPool != null) - using (var conn = this.Ado.MasterPool.Get()) + try { - try + using (var conn = this.Ado.MasterPool.Get()) { (this.InternalCommonUtils as OdbcSqlServerUtils).ServerVersion = int.Parse(conn.Value.ServerVersion.Split('.')[0]); } - catch - { - } + } + catch + { } } diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerProvider.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerProvider.cs index 0b130c33..8ab8e0a8 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerProvider.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerProvider.cs @@ -42,15 +42,15 @@ namespace FreeSql.SqlServer this.CodeFirst = new SqlServerCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression); if (this.Ado.MasterPool != null) - using (var conn = this.Ado.MasterPool.Get()) + try { - try + using (var conn = this.Ado.MasterPool.Get()) { (this.InternalCommonUtils as SqlServerUtils).ServerVersion = int.Parse(conn.Value.ServerVersion.Split('.')[0]); } - catch - { - } + } + catch + { } }