lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 18:34:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'SqlSugar5' of github.com:donet5/SqlSugar

Browse Source
This commit is contained in:
sunkaixuan
2022-07-01 17:53:42 +08:00
parent 0b07667d46 cca468ab83
commit 96367b210e
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@@ -258,17 +258,7 @@ namespace SqlSugar
}
else
{
if (sugarColumn.IsJson && String.IsNullOrEmpty(sugarColumn.ColumnDataType))
{
if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
column.DataType = "json";
}
else
{
column.DataType = "varchar(4000)";
}
}
if (sugarColumn.IsIgnore == false)
{
column.DbColumnName = sugarColumn.ColumnName.IsNullOrEmpty() ? property.Name : sugarColumn.ColumnName;
@@ -294,6 +284,18 @@ namespace SqlSugar
column.IsArray = sugarColumn.IsArray;
column.IsTreeKey = sugarColumn.IsTreeKey;
column.SqlParameterDbType = sugarColumn.SqlParameterDbType;
if (sugarColumn.IsJson && String.IsNullOrEmpty(sugarColumn.ColumnDataType))
{
if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
column.DataType = "json";
}
else
{
column.DataType = "varchar(4000)";
}
}
}
else
{

23
Src/Asp.NetCore2/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@@ -258,17 +258,7 @@ namespace SqlSugar
}
else
{
if (sugarColumn.IsJson && String.IsNullOrEmpty(sugarColumn.ColumnDataType))
{
if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
column.DataType = "json";
}
else
{
column.DataType = "varchar(4000)";
}
}
if (sugarColumn.IsIgnore == false)
{
column.DbColumnName = sugarColumn.ColumnName.IsNullOrEmpty() ? property.Name : sugarColumn.ColumnName;
@@ -294,6 +284,17 @@ namespace SqlSugar
column.IsArray = sugarColumn.IsArray;
column.IsTreeKey = sugarColumn.IsTreeKey;
column.SqlParameterDbType = sugarColumn.SqlParameterDbType;
if (sugarColumn.IsJson && String.IsNullOrEmpty(sugarColumn.ColumnDataType))
{
if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
column.DataType = "json";
}
else
{
column.DataType = "varchar(4000)";
}
}
}
else
{