DbFirst Remark BUG

This commit is contained in:
sunkaixuan 2017-06-26 12:16:51 +08:00
parent 5e75c2131f
commit 1c1be00517

View File

@ -39,7 +39,8 @@ namespace SqlSugar
public void Init()
{
if (!this.Context.DbMaintenance.IsAnySystemTablePermissions()) {
if (!this.Context.DbMaintenance.IsAnySystemTablePermissions())
{
Check.Exception(true, "Dbfirst and Codefirst requires system table permissions");
}
this.TableInfoList = this.Context.RewritableMethods.TranslateCopy(this.Context.DbMaintenance.GetTableInfoList());
@ -230,14 +231,16 @@ namespace SqlSugar
if (hasSugarColumn && this.IsAttribute)
{
List<string> joinList = new List<string>();
if (item.IsPrimarykey) {
if (item.IsPrimarykey)
{
joinList.Add("IsPrimaryKey=true");
}
if (item.IsIdentity)
{
joinList.Add("IsIdentity=true");
}
if (isMappingColumn) {
if (isMappingColumn)
{
joinList.Add("ColumnName=\"" + item.DbColumnName + "\"");
}
SugarColumnText = string.Format(SugarColumnText, string.Join(",", joinList));
@ -287,11 +290,19 @@ namespace SqlSugar
}
private string GetPropertyDescriptionText(DbColumnInfo item, string propertyDescriptionText)
{
propertyDescriptionText = propertyDescriptionText.Replace(DbFirstTemplate.KeyPropertyDescription, item.ColumnDescription);
propertyDescriptionText = propertyDescriptionText.Replace(DbFirstTemplate.KeyPropertyDescription, GetColumnDescription(item.ColumnDescription));
propertyDescriptionText = propertyDescriptionText.Replace(DbFirstTemplate.KeyDefaultValue, GetProertypeDefaultValue(item));
propertyDescriptionText = propertyDescriptionText.Replace(DbFirstTemplate.KeyIsNullable, item.IsNullable.ObjToString());
return propertyDescriptionText;
}
private string GetColumnDescription(string columnDescription)
{
if (columnDescription == null) return columnDescription;
columnDescription = columnDescription.Replace("\r", "\t");
columnDescription = columnDescription.Replace("\n", "\t");
columnDescription = Regex.Replace(columnDescription, "\t{2,}", "\t");
return columnDescription;
}
#endregion
}
}