Skip to content

Commit d266446

Browse files
2881028810
authored andcommitted
- 修复 1.8.0-preview WhereDynamic IN 机制;#431
1 parent bb08943 commit d266446

File tree

4 files changed

+4590
-4475
lines changed

4 files changed

+4590
-4475
lines changed

Examples/base_entity/Program.cs

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,26 @@ public class TestEnumCls
5151
public CollationTypeEnum val { get; set; } = CollationTypeEnum.Binary;
5252
}
5353

54-
static void Main(string[] args)
54+
class Sys_reg_user
55+
{
56+
public Guid Id { get; set; }
57+
public Guid OwnerId { get; set; }
58+
public string UnionId { get; set; }
59+
60+
[Navigate(nameof(OwnerId))]
61+
public Sys_owner Owner { get; set; }
62+
}
63+
class Sys_owner
5564
{
56-
// var result2 = Newtonsoft.Json.JsonConvert.DeserializeObject<TestEnumCls>(@"
57-
//{
58-
// ""val"": ""Binary""
59-
//}");
60-
// var result1 = System.Text.Json.JsonSerializer.Deserialize<TestEnumCls>(@"
61-
//{
62-
// ""val"": ""Binary""
63-
//}");
65+
public Guid Id { get; set; }
66+
public Guid RegUserId { get; set; }
6467

68+
[Navigate(nameof(RegUserId))]
69+
public Sys_reg_user RegUser { get; set; }
70+
}
6571

72+
static void Main(string[] args)
73+
{
6674
#region 初始化 IFreeSql
6775
var fsql = new FreeSql.FreeSqlBuilder()
6876
.UseAutoSyncStructure(true)
@@ -99,6 +107,15 @@ static void Main(string[] args)
99107
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
100108
#endregion
101109

110+
var tsql1 = fsql.Select<Sys_reg_user>()
111+
.Include(a => a.Owner)
112+
.Where(a => a.UnionId == "xxx")
113+
.ToSql();
114+
var tsql2 = fsql.Select<Sys_owner>()
115+
.Where(a => a.RegUser.UnionId == "xxx2")
116+
.ToSql();
117+
118+
102119
var names = (fsql.Select<object>() as Select0Provider)._commonUtils.SplitTableName("`Backups.ProductStockBak`");
103120

104121

@@ -124,19 +141,22 @@ static void Main(string[] args)
124141

125142
var wdy1 = JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
126143
{
127-
""Logic"" : ""Or"",
144+
""Logic"" : ""And"",
128145
""Filters"" :
129146
[
130147
{
131-
""Field"" : ""title"",
132-
""Operator"" : ""eq"",
133-
""Value"" : ""product-1"",
148+
""Logic"" : ""Or"",
134149
""Filters"" :
135150
[
136151
{
137152
""Field"" : ""title"",
138153
""Operator"" : ""contains"",
139154
""Value"" : ""product-1111"",
155+
},
156+
{
157+
""Field"" : ""title"",
158+
""Operator"" : ""contains"",
159+
""Value"" : ""product-2222"",
140160
}
141161
]
142162
},
@@ -212,8 +232,10 @@ static void Main(string[] args)
212232
]
213233
}
214234
", config);
235+
Products.Select.WhereDynamicFilter(wdy1).ToList();
215236
Products.Select.WhereDynamicFilter(wdy2).ToList();
216237

238+
217239
var items1 = Products.Select.Limit(10).OrderByDescending(a => a.CreateTime).ToList();
218240
var items2 = fsql.Select<Products>().Limit(10).OrderByDescending(a => a.CreateTime).ToList();
219241

FreeSql.DbContext/FreeSql.DbContext.xml

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)