From 595d2ae388b767b5c563a987e855dfa694d643e1 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Mon, 16 Jan 2023 20:14:43 +0800 Subject: [PATCH] unittest code --- .../PostgreSQL/PostgreSQLCodeFirstTest.cs | 2 +- FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs | 4 ++-- FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs | 2 +- FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs | 2 +- .../Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs | 2 +- .../FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs | 2 +- Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/PostgreSQL/PostgreSQLCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/PostgreSQL/PostgreSQLCodeFirstTest.cs index a099fb50..835d61cc 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/PostgreSQL/PostgreSQLCodeFirstTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/PostgreSQL/PostgreSQLCodeFirstTest.cs @@ -330,7 +330,7 @@ namespace FreeSql.Tests.PostgreSQL.NetTopologySuite var itemstb = select.ToDataTable(); } - [Table(Name = "tb_alltype_nts")] + [Table(Name = "tb_alltype_nts2")] class TableAllType { [Column(IsIdentity = true, IsPrimary = true)] diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs index 2d91237b..0f2b55d6 100644 --- a/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs @@ -11,12 +11,12 @@ namespace FreeSql.Tests.Dameng { var t1 = g.dameng.Ado.MasterPool.StatisticsFullily; - var connectionString = "data source=127.0.0.1:5236;user id=2user;password=123456789;Pooling=true;poolsize=5"; + var connectionString = "data source=127.0.0.1:5236;user id=2user;password=123456789;"; using (var t2 = new FreeSqlBuilder() .UseConnectionFactory(FreeSql.DataType.Dameng, () => new Dm.DmConnection(connectionString)) .Build()) { - Assert.Equal(connectionString, t2.Ado.ConnectionString); + Assert.Equal("data source=127.0.0.1;port=5236;user id=2user;password=123456789", t2.Ado.ConnectionString); } } diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs index cbad9fad..2c8aebec 100644 --- a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs @@ -17,7 +17,7 @@ namespace FreeSql.Tests.MySql .UseConnectionFactory(FreeSql.DataType.MySql, () => new MySqlConnection(connectionString)) .Build()) { - Assert.Equal(connectionString, t2.Ado.ConnectionString); + Assert.Equal("server=127.0.0.1;port=3306;user id=root;password=root;database=cccddd;characterset=utf8;sslmode=Disabled;maxpoolsize=51;allowuservariables=True", t2.Ado.ConnectionString); } } diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs index a7544d1d..05640403 100644 --- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs +++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs @@ -795,7 +795,7 @@ namespace FreeSql.Internal.CommonProvider public int ExecuteNonQuery(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null) => ExecuteNonQuery(connection, transaction, CommandType.Text, cmdText, 0, null, GetDbParamtersByObject(cmdText, parms)); public int ExecuteNonQuery(CommandType cmdType, string cmdText, params DbParameter[] cmdParms) => ExecuteNonQuery(null, null, cmdType, cmdText, 0, null, cmdParms); public int ExecuteNonQuery(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms) => ExecuteNonQuery(null, transaction, cmdType, cmdText, 0, null, cmdParms); - public int ExecuteNonQuery(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms) => ExecuteNonQuery(null, transaction, cmdType, cmdText, 0, null, cmdParms); + public int ExecuteNonQuery(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms) => ExecuteNonQuery(connection, transaction, cmdType, cmdText, 0, null, cmdParms); public int ExecuteNonQuery(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, Action cmdAfterHandler, params DbParameter[] cmdParms) { if (string.IsNullOrEmpty(cmdText)) return 0; diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs index 29132117..27a6b688 100644 --- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs +++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs @@ -714,7 +714,7 @@ namespace FreeSql.Internal.CommonProvider public Task ExecuteNonQueryAsync(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null, CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(connection, transaction, CommandType.Text, cmdText, 0, null, GetDbParamtersByObject(cmdText, parms), cancellationToken); public Task ExecuteNonQueryAsync(CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(null, null, cmdType, cmdText, 0, null, cmdParms, cancellationToken); public Task ExecuteNonQueryAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(null, transaction, cmdType, cmdText, 0, null, cmdParms, cancellationToken); - public Task ExecuteNonQueryAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(null, transaction, cmdType, cmdText, 0, null, cmdParms, cancellationToken); + public Task ExecuteNonQueryAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(connection, transaction, cmdType, cmdText, 0, null, cmdParms, cancellationToken); async public Task ExecuteNonQueryAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, Func cmdAfterHandler, DbParameter[] cmdParms, CancellationToken cancellationToken = default) { if (string.IsNullOrEmpty(cmdText)) return 0; diff --git a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs index 7feb66c6..df5f24df 100644 --- a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs +++ b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs @@ -49,7 +49,7 @@ namespace FreeSql.Custom.MySql if (string.IsNullOrEmpty(sql)) return 0; Object poolConn = null; - var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, "; SELECT LAST_INSERT_ID();", _commandTimeout), _params); + var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, "; SELECT LAST_INSERT_ID();"), _params); _orm.Aop.CurdBeforeHandler?.Invoke(this, before); long ret = 0; Exception exception = null; diff --git a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs index 801a487a..e9c02273 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs @@ -49,7 +49,7 @@ namespace FreeSql.Odbc.MySql if (string.IsNullOrEmpty(sql)) return 0; Object poolConn = null; - var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, "; SELECT LAST_INSERT_ID();", _commandTimeout), _params); + var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, "; SELECT LAST_INSERT_ID();"), _params); _orm.Aop.CurdBeforeHandler?.Invoke(this, before); long ret = 0; Exception exception = null;