From 780b963267cbde2b34acbb2528812610962c483d Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Wed, 4 Mar 2020 13:10:17 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E5=88=86=E7=A6=BB=E5=88=9B=E5=BB=BA=20IFreeSql=20=E6=97=B6?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BB=8E=E5=BA=93=E4=B8=8D=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=20iis=20=E9=80=80=E5=87=BA=E7=9A=84=20bug?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/dbcontext_01/Controllers/ValuesController.cs | 4 ++-- Examples/dbcontext_01/Startup.cs | 3 +++ Examples/dbcontext_01/dbcontext_01.csproj | 1 + .../MsAccessAdo/MsAccessConnectionPool.cs | 5 ++--- .../FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs | 5 ++--- .../Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs | 5 ++--- .../Default/OdbcAdo/OdbcConnectionPool.cs | 5 ++--- .../GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs | 5 ++--- .../MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs | 5 ++--- .../Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs | 5 ++--- .../OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs | 5 ++--- .../OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs | 5 ++--- .../OracleAdo/OracleConnectionPool.cs | 5 ++--- .../PostgreSQLAdo/PostgreSQLConnectionPool.cs | 5 ++--- .../SqlServerAdo/SqlServerConnectionPool.cs | 5 ++--- .../SqliteAdo/SqliteConnectionPool.cs | 5 ++--- 16 files changed, 32 insertions(+), 41 deletions(-) diff --git a/Examples/dbcontext_01/Controllers/ValuesController.cs b/Examples/dbcontext_01/Controllers/ValuesController.cs index 0df8ab90..e8aa5508 100644 --- a/Examples/dbcontext_01/Controllers/ValuesController.cs +++ b/Examples/dbcontext_01/Controllers/ValuesController.cs @@ -235,9 +235,9 @@ namespace dbcontext_01.Controllers // GET api/values/5 [HttpGet("{id}")] - public ActionResult Get(int id) + public ActionResult Get(int id) { - return "value"; + return _orm.Select().Where(a => a.Id == id).First(); } // POST api/values diff --git a/Examples/dbcontext_01/Startup.cs b/Examples/dbcontext_01/Startup.cs index 6ac054d2..638fc0f6 100644 --- a/Examples/dbcontext_01/Startup.cs +++ b/Examples/dbcontext_01/Startup.cs @@ -20,6 +20,9 @@ namespace dbcontext_01 .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document2.db;Pooling=true;Max Pool Size=10") //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=10") + //.UseConnectionString(DataType.MySql, "Data Source=192.168.164.10;Port=33061;User ID=root;Password=123456;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=5") + //.UseSlave("Data Source=192.168.164.10;Port=33062;User ID=root;Password=123456;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=5") + //.UseConnectionString(FreeSql.DataType.Oracle, "user id=user1;password=123456;data source=//127.0.0.1:1521/XE;Pooling=true;Max Pool Size=10") //.UseSyncStructureToUpper(true) diff --git a/Examples/dbcontext_01/dbcontext_01.csproj b/Examples/dbcontext_01/dbcontext_01.csproj index 516f4a05..5a84476d 100644 --- a/Examples/dbcontext_01/dbcontext_01.csproj +++ b/Examples/dbcontext_01/dbcontext_01.csproj @@ -12,6 +12,7 @@ + diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs index 34e49c8d..4ae88c92 100644 --- a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs +++ b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.MsAccess public MsAccessConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new AccessConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.MsAccess }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs index d1a7311f..61fb63f4 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.MySql public MySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new MySqlConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.MySql }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs index d1db9ed3..a6a23395 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs @@ -23,6 +23,8 @@ namespace FreeSql.Odbc.Dameng { this.UserId = OdbcDamengConnectionPool.GetUserId(connectionString); + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcOracleConnectionPoolPolicy { _pool = this, @@ -30,9 +32,6 @@ namespace FreeSql.Odbc.Dameng }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public static string GetUserId(string connectionString) diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs index 99e4023e..4ce05dd8 100644 --- a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.Odbc.Default public OdbcConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.Odbc.Default }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs index 448f3978..c4830c6d 100644 --- a/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs @@ -22,6 +22,8 @@ namespace FreeSql.Odbc.GBase public OdbcGBaseConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcPostgreSQLConnectionPoolPolicy { _pool = this, @@ -29,9 +31,6 @@ namespace FreeSql.Odbc.GBase }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs index a68020e9..a9a044cc 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.Odbc.MySql public OdbcMySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcMySqlConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.Odbc.MySql }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs index ab255dbd..06f358fe 100644 --- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs @@ -23,6 +23,8 @@ namespace FreeSql.Odbc.Oracle { this.UserId = OdbcOracleConnectionPool.GetUserId(connectionString); + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcOracleConnectionPoolPolicy { _pool = this, @@ -30,9 +32,6 @@ namespace FreeSql.Odbc.Oracle }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public static string GetUserId(string connectionString) diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs index 574ae33b..2230fbc3 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs @@ -20,6 +20,8 @@ namespace FreeSql.Odbc.PostgreSQL public OdbcPostgreSQLConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcPostgreSQLConnectionPoolPolicy { _pool = this, @@ -27,9 +29,6 @@ namespace FreeSql.Odbc.PostgreSQL }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs index ebef1228..d068a424 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.Odbc.SqlServer public OdbcSqlServerConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new OdbcSqlServerConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.Odbc.SqlServer }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs index 2c2178b5..c088d63a 100644 --- a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs +++ b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs @@ -21,6 +21,8 @@ namespace FreeSql.Oracle public OracleConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; this.UserId = OracleConnectionPool.GetUserId(connectionString); var policy = new OracleConnectionPoolPolicy @@ -30,9 +32,6 @@ namespace FreeSql.Oracle }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public static string GetUserId(string connectionString) diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs index ba1ce9a5..007bc36b 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs @@ -20,6 +20,8 @@ namespace FreeSql.PostgreSQL public PostgreSQLConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new PostgreSQLConnectionPoolPolicy { _pool = this, @@ -27,9 +29,6 @@ namespace FreeSql.PostgreSQL }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs index 2e8272fb..7e5496fd 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs @@ -19,6 +19,8 @@ namespace FreeSql.SqlServer public SqlServerConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; var policy = new SqlServerConnectionPoolPolicy { _pool = this, @@ -26,9 +28,6 @@ namespace FreeSql.SqlServer }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false) diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs index fb3ac566..10baf6f0 100644 --- a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs +++ b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs @@ -21,6 +21,8 @@ namespace FreeSql.Sqlite public SqliteConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null) { + this.availableHandler = availableHandler; + this.unavailableHandler = unavailableHandler; policy = new SqliteConnectionPoolPolicy { _pool = this, @@ -28,9 +30,6 @@ namespace FreeSql.Sqlite }; this.Policy = policy; policy.ConnectionString = connectionString; - - this.availableHandler = availableHandler; - this.unavailableHandler = unavailableHandler; } public void Return(Object obj, Exception exception, bool isRecreate = false)