From 6ba128008b6474c60b9ada6d2da17c688711d0e4 Mon Sep 17 00:00:00 2001 From: SampsonYe Date: Fri, 1 Jul 2022 14:47:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20InitTables=20error=20when=20entity=20?= =?UTF-8?q?has=20complex=20props=EF=BC=88just=20like=20IsJson=3Dtrue)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntityMaintenance/EntityMaintenance.cs | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs index d216e311d..7a6d3d343 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs @@ -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 { From 345f0b0790ea386f3a1d7c86a2c53371f4ce36b1 Mon Sep 17 00:00:00 2001 From: SampsonYe Date: Fri, 1 Jul 2022 14:58:08 +0800 Subject: [PATCH 2/2] fix InitTables error when entity has complex props --- .../EntityMaintenance/EntityMaintenance.cs | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs index d216e311d..272a8f638 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs @@ -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 {