Compare commits
No commits in common. "80cc578be92e89fa6851d7878ff3e5927da75460" and "f3d70c0d12401e175fbca6beb3f92311b9888631" have entirely different histories.
80cc578be9
...
f3d70c0d12
|
|
@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
if (inQuery.Id == null && inQuery.VisitTaskId == null)
|
if (inQuery.Id == null && inQuery.VisitTaskId == null)
|
||||||
{
|
{
|
||||||
throw new BusinessValidationFailedException("The interface parameter Id or VisitTaskId cannot be passed at the same time");
|
throw new BusinessValidationFailedException("Id 或者VisitTaskId 必传一个");
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = await _userFeedBackRepository
|
var result = await _userFeedBackRepository
|
||||||
|
|
|
||||||
|
|
@ -61,51 +61,23 @@ public class NoForeignKeyMigrationsSqlGenerator : SqlServerMigrationsSqlGenerato
|
||||||
//}
|
//}
|
||||||
|
|
||||||
// 检查是否是外键索引
|
// 检查是否是外键索引
|
||||||
//var table = model?.FindEntityType(operation.Table);
|
var table = model?.FindEntityType(operation.Table);
|
||||||
//if (table != null)
|
if (table != null)
|
||||||
//{
|
{
|
||||||
// foreach (var foreignKey in table.GetForeignKeys())
|
foreach (var foreignKey in table.GetForeignKeys())
|
||||||
// {
|
{
|
||||||
// // 如果索引列和外键列相同,跳过生成
|
// 如果索引列和外键列相同,跳过生成
|
||||||
// if (operation.Columns.SequenceEqual(foreignKey.Properties.Select(p => p.Name)))
|
if (operation.Columns.SequenceEqual(foreignKey.Properties.Select(p => p.Name)))
|
||||||
// {
|
{
|
||||||
// return; // 跳过生成外键索引
|
return; // 跳过生成外键索引
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (IsForeignKeyIndex(operation, model))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// 非外键索引,调用基类方法正常生成
|
// 非外键索引,调用基类方法正常生成
|
||||||
base.Generate(operation, model, builder, terminate);
|
base.Generate(operation, model, builder, terminate);
|
||||||
}
|
}
|
||||||
private bool IsForeignKeyIndex(CreateIndexOperation operation, IModel? model)
|
|
||||||
{
|
|
||||||
var entity = model?
|
|
||||||
.GetEntityTypes()
|
|
||||||
.FirstOrDefault(e =>
|
|
||||||
e.GetTableName() == operation.Table &&
|
|
||||||
e.GetSchema() == operation.Schema);
|
|
||||||
|
|
||||||
if (entity == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
var tableId = StoreObjectIdentifier.Table(operation.Table, operation.Schema);
|
|
||||||
|
|
||||||
foreach (var fk in entity.GetForeignKeys())
|
|
||||||
{
|
|
||||||
var cols = fk.Properties
|
|
||||||
.Select(p => p.GetColumnName(tableId))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
if (cols.SequenceEqual(operation.Columns))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,6 @@ public class IRaCISDBContext : DbContext
|
||||||
configurationBuilder.Conventions.Remove(typeof(ForeignKeyIndexConvention));
|
configurationBuilder.Conventions.Remove(typeof(ForeignKeyIndexConvention));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue