tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-08-03 10:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 SqlServer 支持 Chinese_PRC_CS_AS 区分小大写；#684

Browse Source
This commit is contained in:
2881099
2021-02-09 17:17:31 +08:00
parent 2dd722e507
commit d93fd91eed
11 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/Curd/SqlServerSelectTest.cs
View File

@ -128,7 +128,7 @@ namespace FreeSql.Tests.Odbc.SqlServer
//Assert.Equal(9989, g.sqlserver.Insert<Topic>(items).NoneParameter().ExecuteAffrows());
var dt1 = select.Limit(10).ToDataTable();
var dt2 = select.Limit(10).ToDataTable("id, getdate()");
var dt2 = select.Limit(10).ToDataTable("Id, getdate()");
var dt3 = select.Limit(10).ToDataTable(a => new { a.Id, a.Type.Name, now = DateTime.Now });
}
class TestDto
@ -899,7 +899,7 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
public void AsTable()
{
var listt = select.AsTable((a, b) => "(select * from tb_topic22 where clicks > 10)").Page(1, 10).ToList();
var listt = select.AsTable((a, b) => "(select * from tb_topic22 where Clicks > 10)").Page(1, 10).ToList();
Func<Type, string, string> tableRule = (type, oldname) =>
{

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

@ -180,10 +180,10 @@ namespace FreeSql.Tests.Odbc.SqlServer
g.sqlserver.Insert<Topic>().AppendData(new Topic()).ExecuteAffrows();
var items = g.sqlserver.Select<Topic>().Limit(2).ToList();
g.sqlserver.Update<Topic>(items).SetRaw("title='test'").ExecuteUpdated();
g.sqlserver.Update<Topic>(items).SetRaw("Title='test'").ExecuteUpdated();
items = g.sqlserver.Select<Topic>().Limit(2).ToList();
var result = g.sqlserver.Update<Topic>(items).SetRaw("title='test'").ExecuteUpdatedAsync().Result;
var result = g.sqlserver.Update<Topic>(items).SetRaw("Title='test'").ExecuteUpdatedAsync().Result;
}
[Fact]

2
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/g.cs
View File

@ -19,7 +19,7 @@ public class g
public static IFreeSql mysql => mysqlLazy.Value;
static Lazy<IFreeSql> sqlserverLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
.UseConnectionString(FreeSql.DataType.OdbcSqlServer, "Driver={SQL Server};Server=.;Persist Security Info=False;Trusted_Connection=Yes;Integrated Security=True;DATABASE=freesqlTest_odbc;Pooling=true;Max pool size=3")
.UseConnectionString(FreeSql.DataType.OdbcSqlServer, "Driver={SQL Server};Server=.;Persist Security Info=False;Trusted_Connection=Yes;Integrated Security=True;DATABASE=issues684_odbc;Pooling=true;Max pool size=3")
//.UseConnectionFactory(FreeSql.DataType.OdbcSqlServer, () => new System.Data.Odbc.OdbcConnection("Driver={SQL Server};Server=.;Persist Security Info=False;Trusted_Connection=Yes;Integrated Security=True;DATABASE=freesqlTest_odbc;Pooling=true;"))
//.UseConnectionString(FreeSql.DataType.OdbcSqlServer, "Driver={SQL Server};Server=192.168.164.129;Persist Security Info=False;Trusted_Connection=Yes;UID=sa;PWD=123456;DATABASE=ds_shop;")
//.UseConnectionFactory(FreeSql.DataType.OdbcSqlServer, () => new System.Data.Odbc.OdbcConnection("Driver={SQL Server};Server=192.168.164.129;Persist Security Info=False;Trusted_Connection=Yes;UID=sa;PWD=123456;DATABASE=ds_shop;"))

28
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs
View File

@ -145,7 +145,7 @@ namespace FreeSql.Tests.SqlServer
//Assert.Equal(9989, g.sqlserver.Insert<Topic>(items).NoneParameter().ExecuteAffrows());
var dt1 = select.Limit(10).ToDataTable();
var dt2 = select.Limit(10).ToDataTable("id, getdate()");
var dt2 = select.Limit(10).ToDataTable("Id, getdate()");
var dt3 = select.Limit(10).ToDataTable(a => new { a.Id, a.Type.Name, now = DateTime.Now });
}
class TestDto
@ -609,9 +609,9 @@ namespace FreeSql.Tests.SqlServer
query2.ToList();
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
query = select.Where("a.clicks > 100 and a.id = @id", new { id = 10 });
query = select.Where("a.Clicks > 100 and a.Id = @id", new { id = 10 });
sql = query.ToSql().Replace("\r\n", "");
Assert.Equal("SELECT a.[Id], a.[Clicks], a.[TypeGuid], a.[Title], a.[CreateTime] FROM [tb_topic22] a WHERE (a.clicks > 100 and a.id = @id)", sql);
Assert.Equal("SELECT a.[Id], a.[Clicks], a.[TypeGuid], a.[Title], a.[CreateTime] FROM [tb_topic22] a WHERE (a.Clicks > 100 and a.Id = @id)", sql);
query.ToList();
}
[Fact]
@ -657,9 +657,9 @@ namespace FreeSql.Tests.SqlServer
query2.ToList();
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
query = select.WhereIf(true, "a.clicks > 100 and a.id = @id", new { id = 10 });
query = select.WhereIf(true, "a.Clicks > 100 and a.Id = @id", new { id = 10 });
sql = query.ToSql().Replace("\r\n", "");
Assert.Equal("SELECT a.[Id], a.[Clicks], a.[TypeGuid], a.[Title], a.[CreateTime] FROM [tb_topic22] a WHERE (a.clicks > 100 and a.id = @id)", sql);
Assert.Equal("SELECT a.[Id], a.[Clicks], a.[TypeGuid], a.[Title], a.[CreateTime] FROM [tb_topic22] a WHERE (a.Clicks > 100 and a.Id = @id)", sql);
query.ToList();
// ==========================================WhereIf(false)
@ -704,7 +704,7 @@ namespace FreeSql.Tests.SqlServer
query2.ToList();
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
query = select.WhereIf(false, "a.clicks > 100 and a.id = @id", new { id = 10 });
query = select.WhereIf(false, "a.Clicks > 100 and a.Id = @id", new { id = 10 });
sql = query.ToSql().Replace("\r\n", "");
Assert.Equal("SELECT a.[Id], a.[Clicks], a.[TypeGuid], a.[Title], a.[CreateTime] FROM [tb_topic22] a", sql);
query.ToList();
@ -955,7 +955,7 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
public void AsTable()
{
var listt = select.AsTable((a, b) => "(select * from tb_topic22 where clicks > 10)").Page(1, 10).ToList();
var listt = select.AsTable((a, b) => "(select * from tb_topic22 where Clicks > 10)").Page(1, 10).ToList();
Func<Type, string, string> tableRule = (type, oldname) =>
{
@ -1053,8 +1053,8 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
});
var testUnionAll = select
.WithSql("SELECT * FROM [tb_topic22] where id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where id = @id2", new { id2 = 11 })
.WithSql("SELECT * FROM [tb_topic22] where Id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where Id = @id2", new { id2 = 11 })
.ToSql(a => new
{
a.Id,
@ -1062,8 +1062,8 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
});
var testUnionAllToList = select
.WithSql("SELECT * FROM [tb_topic22] where id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where id = @id2", new { id2 = 11 })
.WithSql("SELECT * FROM [tb_topic22] where Id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where Id = @id2", new { id2 = 11 })
.ToList(a => new
{
a.Id,
@ -1071,13 +1071,13 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
});
var testUnionAll2 = g.sqlite.Select<object>()
.WithSql("SELECT * FROM [tb_topic22] where id = 10")
.WithSql("SELECT * FROM [tb_topic22] where id = 11")
.WithSql("SELECT * FROM [tb_topic22] where Id = 10")
.WithSql("SELECT * FROM [tb_topic22] where Id = 11")
.ToDataTable("*");
var multiWithSql = g.sqlite.Select<TestInclude_OneToManyModel1, TestInclude_OneToManyModel2, TestInclude_OneToManyModel3>()
.WithSql(
"select * from TestInclude_OneToManyModel1 where id=@id1",
"select * from TestInclude_OneToManyModel1 where Id=@id1",
"select * from TestInclude_OneToManyModel2 where model2id=@id2",
null,
new { id1 = 10, id2 = 11, id3 = 13 }

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

@ -193,10 +193,10 @@ namespace FreeSql.Tests.SqlServer
g.sqlserver.Insert<Topic>().AppendData(new Topic()).ExecuteAffrows();
var items = g.sqlserver.Select<Topic>().Limit(2).ToList();
g.sqlserver.Update<Topic>(items).SetRaw("title='test'").ExecuteUpdated();
g.sqlserver.Update<Topic>(items).SetRaw("Title='test'").ExecuteUpdated();
items = g.sqlserver.Select<Topic>().Limit(2).ToList();
var result = g.sqlserver.Update<Topic>(items).SetRaw("title='test'").ExecuteUpdatedAsync().Result;
var result = g.sqlserver.Update<Topic>(items).SetRaw("Title='test'").ExecuteUpdatedAsync().Result;
}
[Fact]

6
FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
View File

@ -131,12 +131,12 @@ namespace FreeSql.Tests.SqlServer
var t4 = g.sqlserver.Ado.Query<(int, int, string, string DateTime)>("select * from xxx");
var t5 = g.sqlserver.Ado.Query<dynamic>("select * from xxx where Id = @Id",
var t5 = g.sqlserver.Ado.Query<dynamic>("select * from xxx where Id = @id",
new Dictionary<string, object> { ["id"] = 1 });
var t6 = g.sqlserver.Ado.Query<xxx>("select * from xxx where id in @ids", new { ids = new[] { 1, 2, 3 } });
var t6 = g.sqlserver.Ado.Query<xxx>("select * from xxx where Id in @ids", new { ids = new[] { 1, 2, 3 } });
var t7 = g.sqlserver.Ado.Query<xxx>("select * from xxx where title in @titles", new { titles = new[] { "title1", "title2", "title2" } });
var t7 = g.sqlserver.Ado.Query<xxx>("select * from xxx where Title in @titles", new { titles = new[] { "title1", "title2", "title2" } });
}

2
FreeSql.Tests/FreeSql.Tests/g.cs
View File

@ -41,7 +41,7 @@ public class g
public static IFreeSql pgsql => pgsqlLazy.Value;
static Lazy<IFreeSql> sqlserverLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3")
.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=issues684;Pooling=true;Max Pool Size=3")
.UseAutoSyncStructure(true)
.UseMonitorCommand(
cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前