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

- 修复 UpdateDict 不支持 SET NULL 的更新；#1257

Browse Source
This commit is contained in:
2881099 2022-09-21 14:27:03 +08:00
parent ed3b48c833
commit 4f66451c20
3 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Examples/base_entity/Program.cs
View File

@ -362,10 +362,13 @@ namespace base_entity
public string code { get; set; }
public string parentcode { get; set; }
public string name { get; set; }
[Column(MapType = typeof(string))]
public string JoinTest01Enum { get; set; }
[JoinCondition("a.parentcode = b.code")]
public JoinTest01 Parent { get; set; }
}
public enum JoinTest01Enum { f1, f2, f3 }
static void Main(string[] args)
{
@ -424,6 +427,45 @@ namespace base_entity
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("id", 1);
dic.Add("name", "xxxx");
var diclist = new List<Dictionary<string, object>>();
diclist.Add(dic);
diclist.Add(new Dictionary<string, object>
{
["id"] = 2,
["name"] = "123,1234,123444"
});
var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter(false).ToSql();
sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter(false).ToSql();
dic["xxx"] = null;
var sqlupd1 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").ToSql();
var sqlupd2 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").ToSql();
var sqlupd11 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
var sqlupd22 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
var sqldel1 = fsql.DeleteDict(dic).AsTable("table1").ToSql();
var sqldel2 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
diclist[1]["title"] = "newtitle";
var sqldel3 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
diclist.Clear();
diclist.Add(new Dictionary<string, object>
{
["id"] = 1
});
diclist.Add(new Dictionary<string, object>
{
["id"] = 2
});
var sqldel4 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
fsql.Aop.ParseExpression += (_, e) =>
{
if (e.Expression is MemberExpression memExp == false) return;
@ -447,6 +489,7 @@ namespace base_entity
return;
}
if (parmExp == null) return;
if (e.Tables == null) return;
var oldTables = e.Tables.ToArray();
var result = e.FreeParse(e.Expression);
for (var a = oldTables.Length; a < e.Tables.Count; a++)
@ -467,6 +510,8 @@ namespace base_entity
var joinsql1 = fsql.Select<JoinTest01>()
.Include(a => a.Parent.Parent)
.Where(a => a.Parent.Parent.code == "001")
.Where(a => a.JoinTest01Enum == JoinTest01Enum.f3.ToString())
.Where(a => object.Equals(a.JoinTest01Enum, JoinTest01Enum.f3))
.ToSql();
@ -769,42 +814,6 @@ namespace base_entity
}
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("id", 1);
dic.Add("name", "xxxx");
var diclist = new List<Dictionary<string, object>>();
diclist.Add(dic);
diclist.Add(new Dictionary<string, object>
{
["id"] = 2,
["name"] = "123,1234,123444"
});
var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter(false).ToSql();
sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter(false).ToSql();
var sqlupd1 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").ToSql();
var sqlupd2 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").ToSql();
var sqlupd11 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
var sqlupd22 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
var sqldel1 = fsql.DeleteDict(dic).AsTable("table1").ToSql();
var sqldel2 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
diclist[1]["title"] = "newtitle";
var sqldel3 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
diclist.Clear();
diclist.Add(new Dictionary<string, object>
{
["id"] = 1
});
diclist.Add(new Dictionary<string, object>
{
["id"] = 2
});
var sqldel4 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
var sql1 = fsql.Select<User1, UserGroup>()
.RawJoin("FULL JOIN UserGroup b ON b.id = a.GroupId")
.Where((a, b) => a.IsDeleted == false)

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -800,5 +800,14 @@
<param name="that"></param>
<returns></returns>
</member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members>
</doc>

6
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -461,8 +461,10 @@ namespace FreeSql.Internal.CommonProvider
var tempDict = new Dictionary<string, object>();
foreach (var item in dicType)
foreach (string key in item.Keys)
if (!tempDict.ContainsKey(key) && !(item[key] is null))
tempDict[key] = item[key];
{
if (!tempDict.ContainsKey(key)) tempDict[key] = item[key];
else if (!(item[key] is null)) tempDict[key] = item[key];
}
UpdateProvider<Dictionary<string, object>>.GetDictionaryTableInfo(tempDict, orm, ref table);
return;
}