tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 01:05:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 string IsNullable = false 时插入 null 自动转为 "" #445；

Browse Source
This commit is contained in:
28810
2020-09-02 19:20:41 +08:00
parent d025603997
commit 8eadde930f
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,5 +532,14 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </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> </members>
</doc> </doc>

2
FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
View File

@@ -92,6 +92,8 @@ namespace FreeSql.Internal.CommonProvider
if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false) if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false)
changedDict.Add(col.Attribute.Name, true); changedDict.Add(col.Attribute.Name, true);
} }
if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false)
col.SetValue(data, val = "");
} }
} }

2
FreeSql/Internal/CommonProvider/InsertProvider.cs
View File

@@ -171,6 +171,8 @@ namespace FreeSql.Internal.CommonProvider
col.SetValue(data, val = FreeUtil.NewMongodbId()); col.SetValue(data, val = FreeUtil.NewMongodbId());
} }
} }
if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false)
col.SetValue(data, val = "");
} }
} }

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

@@ -359,6 +359,8 @@ namespace FreeSql.Internal.CommonProvider
if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false) if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false)
changedDict.Add(col.Attribute.Name, true); changedDict.Add(col.Attribute.Name, true);
} }
if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false)
col.SetValue(data, val = "");
} }
} }
} }
@@ -379,6 +381,8 @@ namespace FreeSql.Internal.CommonProvider
if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false) if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false)
changedDict.Add(col.Attribute.Name, true); changedDict.Add(col.Attribute.Name, true);
} }
if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false)
col.SetValue(data, val = "");
} }
} }