Skip to content

Commit ecd27fb

Browse files
committed
- 修复 InsertDict 部分新功能遗留问题(特别是 Oracle);
1 parent b9a21f6 commit ecd27fb

File tree

28 files changed

+69
-52
lines changed

28 files changed

+69
-52
lines changed

FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseSelectTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ FROM Tag a
9595
var t1 = g.gbase.Select<Tag>().Where(a => a.Tags.AsSelect().Any(t => t.Parent.Id == 10)).ToSql();
9696
Assert.Equal(@"SELECT a.Id, a.Parent_id, a.Ddd, a.Name
9797
FROM Tag a
98-
WHERE (exists(SELECT FIRST 1 1
98+
WHERE (exists(SELECT 1
9999
FROM Tag t
100100
LEFT JOIN Tag t__Parent ON t__Parent.Id = t.Parent_id
101101
WHERE (t__Parent.Id = 10) AND (t.Parent_id = a.Id)))", t1);
@@ -104,9 +104,9 @@ FROM Tag t
104104
var t2 = g.gbase.Select<Song>().Where(s => s.Tags.AsSelect().Any(t => t.Name == "国语")).ToSql();
105105
Assert.Equal(@"SELECT a.Id, a.Create_time, a.Is_deleted, a.Title, a.Url
106106
FROM Song a
107-
WHERE (exists(SELECT FIRST 1 1
107+
WHERE (exists(SELECT 1
108108
FROM Song_tag Mt_Ms
109-
WHERE (Mt_Ms.Song_id = a.Id) AND (exists(SELECT FIRST 1 1
109+
WHERE (Mt_Ms.Song_id = a.Id) AND (exists(SELECT 1
110110
FROM Tag t
111111
WHERE (t.Name = '国语') AND (t.Id = Mt_Ms.Tag_id)))))", t2);
112112
}

FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ public class g
3535
});
3636
public static IFreeSql gbase => gbaseLazy.Value;
3737

38+
//su - gbasedbt
39+
//oninit -vy
3840
}

FreeSql.Tests/FreeSql.Tests/Issues/804.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void TestMonthAndData()
106106

107107
var d1 = fsql.Select<Users>().Where(r => r.CreateTime.Month == month).ToList();
108108
var d2 = fsql.Select<Users>().Where(r => r.CreateTime.Year == year).ToList();
109-
var d5 = fsql.Select<Users>().Where(r => r.CreateTime.Year == 2021).ToList();
109+
var d5 = fsql.Select<Users>().Where(r => r.CreateTime.Year == 2022).ToList();
110110

111111
Assert.Single(dmonth1);
112112
Assert.Single(d1);

FreeSql.Tests/FreeSql.Tests/UnitTest5.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void TestDoubleWhereBug()
3333
{
3434
is_lock = test.ratio < 1 //这里生成的SQL语句有问题 ratio = 0.9 或 1.9 或 2.1 等等都是生成的是1
3535
}).Where(m => test.ratio < 1).ToSql();
36-
Assert.Equal(@"UPDATE TestDto SET is_lock = 2.1 < 1
36+
Assert.Equal(@"UPDATE `TestDto` SET `is_lock` = 2.1 < 1
3737
WHERE (2.1 < 1)", sql);
3838
}
3939

0 commit comments

Comments
 (0)