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

- 增加 EfCoreFluentApi 扩展包，接近 efcore fluentApi 的使用习惯；#4

Browse Source 
- 增加 ColumnAttribute 属性 InsertValueSql，插入数据的时候指定用 sql 值；
This commit is contained in:
28810
2019-12-29 15:30:43 +08:00
parent 20ffad0ba3
commit 8cb7ef2130
14 changed files with 721 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FreeSql/Internal/CommonUtils.cs
View File

@@ -58,7 +58,7 @@ namespace FreeSql.Internal
if (entity == null) return _orm.CodeFirst;
var type = typeof(T);
var table = dicConfigEntity.GetOrAdd(type, new TableAttribute());
var fluent = new TableFluent<T>(table);
var fluent = new TableFluent<T>(CodeFirst, table);
entity.Invoke(fluent);
Utils.RemoveTableByEntity(type, this); //remove cache
return _orm.CodeFirst;
@@ -67,7 +67,7 @@ namespace FreeSql.Internal
{
if (entity == null) return _orm.CodeFirst;
var table = dicConfigEntity.GetOrAdd(type, new TableAttribute());
var fluent = new TableFluent(type, table);
var fluent = new TableFluent(CodeFirst, type, table);
entity.Invoke(fluent);
Utils.RemoveTableByEntity(type, this); //remove cache
return _orm.CodeFirst;
@@ -132,6 +132,7 @@ namespace FreeSql.Internal
if (trycol._CanUpdate != null) attr._CanUpdate = trycol.CanUpdate;
if (trycol.ServerTime != DateTimeKind.Unspecified) attr.ServerTime = trycol.ServerTime;
if (trycol._StringLength != null) attr.StringLength = trycol.StringLength;
if (!string.IsNullOrEmpty(trycol.InsertValueSql)) attr.InsertValueSql = trycol.InsertValueSql;
}
var attrs = proto.GetCustomAttributes(typeof(ColumnAttribute), false);
foreach (var tryattrobj in attrs)
@@ -152,6 +153,7 @@ namespace FreeSql.Internal
if (tryattr._CanUpdate != null) attr._CanUpdate = tryattr.CanUpdate;
if (tryattr.ServerTime != DateTimeKind.Unspecified) attr.ServerTime = tryattr.ServerTime;
if (tryattr._StringLength != null) attr.StringLength = tryattr.StringLength;
if (!string.IsNullOrEmpty(tryattr.InsertValueSql)) attr.InsertValueSql = tryattr.InsertValueSql;
}
ColumnAttribute ret = null;
if (!string.IsNullOrEmpty(attr.Name)) ret = attr;
@@ -168,6 +170,7 @@ namespace FreeSql.Internal
if (attr._CanUpdate != null) ret = attr;
if (attr.ServerTime != DateTimeKind.Unspecified) ret = attr;
if (attr._StringLength != null) ret = attr;
if (!string.IsNullOrEmpty(attr.InsertValueSql)) ret = attr;
if (ret != null && ret.MapType == null) ret.MapType = proto.PropertyType;
return ret;
}

5
FreeSql/Internal/UtilsExpressionTree.cs
View File

@@ -191,6 +191,11 @@ namespace FreeSql.Internal
col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc;
col.DbInsertValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc;
}
if (string.IsNullOrEmpty(colattr.InsertValueSql) == false)
{
col.DbDefaultValue = colattr.InsertValueSql;
col.DbInsertValue = colattr.InsertValueSql;
}
if (colattr.MapType == typeof(string) && colattr.StringLength != 0)
{
int strlen = colattr.StringLength;