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

- 修复 IUpdate.Set(a => a.xx = null) 表达式解析 bug；#311

Browse Source
This commit is contained in:
28810
2020-05-15 13:27:44 +08:00
parent 2a3febdad5
commit 0991464fd0
19 changed files with 130 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
FreeSql.Tests/FreeSql.Tests.PerformanceTests/MySqlAdoTest.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Threading;
using FreeSql.Internal;
namespace FreeSql.Tests.PerformanceTest
{
@ -24,7 +25,7 @@ namespace FreeSql.Tests.PerformanceTest
List<xxx> dplist1 = null;
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist1 = Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from song").ToList();
dplist1 = Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from freesql_song").ToList();
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Entity Counts: {dplist1.Count}; ORM: Dapper");
@ -33,7 +34,7 @@ namespace FreeSql.Tests.PerformanceTest
List<(int, string, string)> dplist2 = null;
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist2 = Dapper.SqlMapper.Query<(int, string, string)>(conn.Value, "select * from song").ToList();
dplist2 = Dapper.SqlMapper.Query<(int, string, string)>(conn.Value, "select * from freesql_song").ToList();
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Tuple Counts: {dplist2.Count}; ORM: Dapper");
@ -42,7 +43,7 @@ namespace FreeSql.Tests.PerformanceTest
List<dynamic> dplist3 = null;
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist3 = Dapper.SqlMapper.Query<dynamic>(conn.Value, "select * from song").ToList();
dplist3 = Dapper.SqlMapper.Query<dynamic>(conn.Value, "select * from freesql_song").ToList();
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Dynamic Counts: {dplist3.Count}; ORM: Dapper");
@ -50,15 +51,15 @@ namespace FreeSql.Tests.PerformanceTest
var t31 = g.mysql.Ado.Query<xxx>("select * from song limit 1");
var t31 = g.mysql.Ado.Query<xxx>("select * from freesql_song limit 1");
time.Restart();
var t3 = g.mysql.Ado.Query<xxx>("select * from song");
var t3 = g.mysql.Ado.Query<xxx>("select * from freesql_song");
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Entity Counts: {t3.Count}; ORM: FreeSql*");
time.Restart();
var t4 = g.mysql.Ado.Query<(int, string, string)>("select * from song");
var t4 = g.mysql.Ado.Query<(int, string, string)>("select * from freesql_song");
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Tuple Counts: {t4.Count}; ORM: FreeSql*");
@ -68,7 +69,7 @@ namespace FreeSql.Tests.PerformanceTest
sb.AppendLine($"Elapsed: {time.Elapsed}; Query ToList<Tuple> Counts: {t41.Count}; ORM: FreeSql*");
time.Restart();
var t5 = g.mysql.Ado.Query<dynamic>("select * from song");
var t5 = g.mysql.Ado.Query<dynamic>("select * from freesql_song");
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Dynamic Counts: {t3.Count}; ORM: FreeSql*");
@ -86,7 +87,7 @@ namespace FreeSql.Tests.PerformanceTest
{
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist1.AddRange(Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from song limit 10").ToList());
dplist1.AddRange(Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from freesql_song limit 10").ToList());
}
}
time.Stop();
@ -98,7 +99,7 @@ namespace FreeSql.Tests.PerformanceTest
{
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist2.AddRange(Dapper.SqlMapper.Query<(int, string, string)>(conn.Value, "select * from song limit 10").ToList());
dplist2.AddRange(Dapper.SqlMapper.Query<(int, string, string)>(conn.Value, "select * from freesql_song limit 10").ToList());
}
}
time.Stop();
@ -110,7 +111,7 @@ namespace FreeSql.Tests.PerformanceTest
{
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist3.AddRange(Dapper.SqlMapper.Query<dynamic>(conn.Value, "select * from song limit 10").ToList());
dplist3.AddRange(Dapper.SqlMapper.Query<dynamic>(conn.Value, "select * from freesql_song limit 10").ToList());
}
}
time.Stop();
@ -123,7 +124,7 @@ namespace FreeSql.Tests.PerformanceTest
List<xxx> t3 = new List<xxx>();
for (var a = 0; a < 10000; a++)
{
t3.AddRange(g.mysql.Ado.Query<xxx>("select * from song limit 10"));
t3.AddRange(g.mysql.Ado.Query<xxx>("select * from freesql_song limit 10"));
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Entity Counts: {t3.Count}; ORM: FreeSql*");
@ -132,7 +133,7 @@ namespace FreeSql.Tests.PerformanceTest
List<(int, string, string)> t4 = new List<(int, string, string)>();
for (var a = 0; a < 10000; a++)
{
t4.AddRange(g.mysql.Ado.Query<(int, string, string)>("select * from song limit 10"));
t4.AddRange(g.mysql.Ado.Query<(int, string, string)>("select * from freesql_song limit 10"));
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Tuple Counts: {t4.Count}; ORM: FreeSql*");
@ -141,7 +142,7 @@ namespace FreeSql.Tests.PerformanceTest
List<dynamic> t5 = new List<dynamic>();
for (var a = 0; a < 10000; a++)
{
t5.AddRange(g.mysql.Ado.Query<dynamic>("select * from song limit 10"));
t5.AddRange(g.mysql.Ado.Query<dynamic>("select * from freesql_song limit 10"));
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Dynamic Counts: {t3.Count}; ORM: FreeSql*");
@ -155,17 +156,53 @@ namespace FreeSql.Tests.PerformanceTest
var time = new Stopwatch();
//var t31 = g.mysql.Select<xxx>().ToList();
g.mysql.Select<xxx>().First();
time.Restart();
var t3 = g.mysql.Select<xxx>().ToList();
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; ToList Entity Counts: {t3.Count}; ORM: FreeSql*");
time.Restart();
var adoarr1 = g.mysql.Ado.ExecuteArray("select * from freesql_song");
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; ExecuteArray Entity Counts: {adoarr1.Length}; ORM: FreeSql ExecuteArray*");
time.Restart();
var adolist1 = new List<xxx>();
g.mysql.Ado.ExecuteReader(dr =>
{
var xim = new xxx();
var val1 = dr.GetValue(0);
if (val1 is int) ;
val1 = int.Parse(string.Format("{0}", val1));
xim.Id = (int)val1;
val1 = dr.GetValue(1);
if (val1 is DateTime) ;
val1 = (DateTime)val1;
xim.Create_time = (DateTime)val1;
val1 = dr.GetValue(2);
if (val1 is int) ;
val1 = int.Parse(string.Format("{0}", val1)) != 0;
xim.Is_deleted = (bool)val1;
val1 = dr.GetValue(3);
if (val1 is string) ;
val1 = (string)val1;
xim.Title = (string)val1;
val1 = dr.GetValue(4);
if (val1 is string) ;
val1 = (string)val1;
xim.Title = (string)val1;
adolist1.Add(xim);
}, "select * from freesql_song");
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; ExecuteReader Entity Counts: {adolist1.Count}; ORM: FreeSql ExecuteReader*");
time.Restart();
List<xxx> dplist1 = null;
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist1 = Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from song").ToList();
dplist1 = Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from freesql_song").ToList();
}
time.Stop();
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Entity Counts: {dplist1.Count}; ORM: Dapper");
@ -201,7 +238,7 @@ namespace FreeSql.Tests.PerformanceTest
{
using (var conn = g.mysql.Ado.MasterPool.Get())
{
dplist1.AddRange(Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from song limit 50").ToList());
dplist1.AddRange(Dapper.SqlMapper.Query<xxx>(conn.Value, "select * from freesql_song limit 50").ToList());
}
}
Interlocked.Add(ref dplist1Count, dplist1.Count);
@ -211,12 +248,12 @@ namespace FreeSql.Tests.PerformanceTest
sb.AppendLine($"Elapsed: {time.Elapsed}; Query Entity Counts: {dplist1Count}; ORM: Dapper");
}
[Table(Name = "song")]
[Table(Name = "freesql_song")]
class xxx
{
public int Id { get; set; }
public string Title { get; set; }
//public string Url { get; set; }
public string Url { get; set; }
public DateTime Create_time { get; set; }
public bool Is_deleted { get; set; }
}

3
FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs
View File

@ -148,6 +148,9 @@ namespace FreeSql.Tests.MySqlConnector
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Id` = 10 WHERE (`Id` = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Clicks` = NULL WHERE (`Id` = 1)", sql);
var id = g.mysql.Insert<TestEnumUpdateTb>().AppendData(new TestEnumUpdateTb { type = TestEnumUpdateTbType.sum211 }).ExecuteIdentity();
Assert.True(id > 0);
sql = g.mysql.Update<TestEnumUpdateTb>().Where(a => a.id == id).Set(a => a.type, TestEnumUpdateTbType.biggit).ToSql().Replace("\r\n", "");

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengUpdateTest.cs
View File

@ -115,6 +115,9 @@ namespace FreeSql.Tests.Odbc.Dameng
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"ID\" = 10 WHERE (\"ID\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"CLICKS\" = NULL WHERE (\"ID\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/Curd/OdbcUpdateTest.cs
View File

@ -107,6 +107,9 @@ namespace FreeSql.Tests.Odbc.Default
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Id] = 10 WHERE ([Id] = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Clicks] = NULL WHERE ([Id] = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlUpdateTest.cs
View File

@ -148,6 +148,9 @@ namespace FreeSql.Tests.Odbc.MySql
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Id` = 10 WHERE (`Id` = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Clicks` = NULL WHERE (`Id` = 1)", sql);
var id = g.mysql.Insert<TestEnumUpdateTb>().AppendData(new TestEnumUpdateTb { type = TestEnumUpdateTbType.sum211 }).ExecuteIdentity();
Assert.True(id > 0);
sql = g.mysql.Update<TestEnumUpdateTb>().Where(a => a.id == id).Set(a => a.type, TestEnumUpdateTbType.biggit).ToSql().Replace("\r\n", "");

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/Curd/OracleUpdateTest.cs
View File

@ -105,6 +105,9 @@ namespace FreeSql.Tests.Odbc.Oracle
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"ID\" = 10 WHERE (\"ID\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"CLICKS\" = NULL WHERE (\"ID\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/Curd/PostgreSQLUpdateTest.cs
View File

@ -106,6 +106,9 @@ namespace FreeSql.Tests.Odbc.PostgreSQL
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"id\" = 10 WHERE (\"id\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = NULL WHERE (\"id\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/Curd/SqlServerUpdateTest.cs
View File

@ -108,6 +108,9 @@ namespace FreeSql.Tests.Odbc.SqlServer
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Id] = 10 WHERE ([Id] = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Clicks] = NULL WHERE ([Id] = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengUpdateTest.cs
View File

@ -115,6 +115,9 @@ namespace FreeSql.Tests.Dameng
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"ID\" = 10 WHERE (\"ID\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"CLICKS\" = NULL WHERE (\"ID\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessUpdateTest.cs
View File

@ -117,6 +117,9 @@ namespace FreeSql.Tests.MsAccess
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Id] = 10 WHERE ([Id] = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Clicks] = NULL WHERE ([Id] = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlUpdateTest.cs
View File

@ -149,6 +149,9 @@ namespace FreeSql.Tests.MySql
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Id` = 10 WHERE (`Id` = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE `tb_topic` SET `Clicks` = NULL WHERE (`Id` = 1)", sql);
var id = g.mysql.Insert<TestEnumUpdateTb>().AppendData(new TestEnumUpdateTb { type = TestEnumUpdateTbType.sum211 }).ExecuteIdentity();
Assert.True(id > 0);
sql = g.mysql.Update<TestEnumUpdateTb>().Where(a => a.id == id).Set(a => a.type, TestEnumUpdateTbType.biggit).ToSql().Replace("\r\n", "");

3
FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleUpdateTest.cs
View File

@ -105,6 +105,9 @@ namespace FreeSql.Tests.Oracle
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"ID\" = 10 WHERE (\"ID\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"TB_TOPIC\" SET \"CLICKS\" = NULL WHERE (\"ID\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLUpdateTest.cs
View File

@ -107,6 +107,9 @@ namespace FreeSql.Tests.PostgreSQL
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"id\" = 10 WHERE (\"id\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = NULL WHERE (\"id\" = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerUpdateTest.cs
View File

@ -118,6 +118,9 @@ namespace FreeSql.Tests.SqlServer
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Id] = 10 WHERE ([Id] = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE [tb_topic] SET [Clicks] = NULL WHERE ([Id] = 1)", sql);
}
[Fact]
public void SetRaw()

3
FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteUpdateTest.cs
View File

@ -124,6 +124,9 @@ namespace FreeSql.Tests.Sqlite
sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"Id\" = 10 WHERE (\"Id\" = 1)", sql);
sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = NULL WHERE (\"Id\" = 1)", sql);
}
[Fact]
public void SetRaw()