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

v0.3.12 增加 ICodeFirst.IsConfigEntityFromDbFirst，若无配置实体类主键、自增，可从数据库导入；

Browse Source
This commit is contained in:
28810
2019-03-11 19:00:44 +08:00
parent 4f66c3b9eb
commit dae8eb7a67
17 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FreeSql/Internal/CommonUtils.cs
View File

@@ -1,4 +1,5 @@
using FreeSql.DataAnnotations;
using FreeSql.DatabaseModel;
using FreeSql.Internal.Model;
using System;
using System.Collections;
@@ -27,6 +28,8 @@ namespace FreeSql.Internal {
internal IFreeSql _orm { get; set; }
internal ICodeFirst CodeFirst => _orm.CodeFirst;
internal TableInfo GetTableByEntity(Type entity) => Utils.GetTableByEntity(entity, this);
internal List<DbTableInfo> dbTables { get; set; }
internal object dbTablesLock = new object();
public CommonUtils(IFreeSql orm) {
_orm = orm;

32
FreeSql/Internal/UtilsExpressionTree.cs
View File

@@ -113,8 +113,8 @@ namespace FreeSql.Internal {
}
trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
if (trytb.Primarys.Any() == false) {
var identcols = trytb.Columns.Values.Where(a => a.Attribute.IsIdentity == true).FirstOrDefault();
if (identcols != null) trytb.Primarys = new[] { identcols };
var identcol = trytb.Columns.Values.Where(a => a.Attribute.IsIdentity == true).FirstOrDefault();
if (identcol != null) trytb.Primarys = new[] { identcol };
if (trytb.Primarys.Any() == false) {
trytb.Primarys = trytb.Columns.Values.Where(a => string.Compare(a.Attribute.Name, "id", true) == 0).ToArray();
if (trytb.Primarys.Any() == false) {
@@ -127,6 +127,34 @@ namespace FreeSql.Internal {
foreach (var col in trytb.Primarys)
col.Attribute.IsPrimary = true;
}
//从数据库查找主键、自增
if (common.CodeFirst.IsConfigEntityFromDbFirst) {
try {
if (common._orm.DbFirst != null) {
if (common.dbTables == null)
lock (common.dbTablesLock)
if (common.dbTables == null)
common.dbTables = common._orm.DbFirst.GetTablesByDatabase();
var finddbtbs = common.dbTables.Where(a => string.Compare(a.Name, trytb.CsName, true) == 0 || string.Compare(a.Name, trytb.DbName, true) == 0);
foreach (var dbtb in finddbtbs) {
foreach (var dbident in dbtb.Identitys) {
if (trytb.Columns.TryGetValue(dbident.Name, out var trycol) && trycol.CsType == dbident.CsType ||
trytb.ColumnsByCs.TryGetValue(dbident.Name, out trycol) && trycol.CsType == dbident.CsType) {
trycol.Attribute.IsIdentity = true;
}
}
foreach (var dbpk in dbtb.Primarys) {
if (trytb.Columns.TryGetValue(dbpk.Name, out var trycol) && trycol.CsType == dbpk.CsType ||
trytb.ColumnsByCs.TryGetValue(dbpk.Name, out trycol) && trycol.CsType == dbpk.CsType) {
trycol.Attribute.IsPrimary = true;
}
}
}
}
} catch { }
trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
}
tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
#region virtual 属性延时加载，动态产生新的重写类