diff --git a/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite b/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite index 2e464d768..76d31ba2d 100644 Binary files a/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite and b/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite differ diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index a55229561..b65d0b8d7 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -484,8 +484,21 @@ namespace SqlSugar } result.Add(item); } + return result; } - return result; + else { + DiffLogTableInfo diffTable = new DiffLogTableInfo(); + diffTable.TableName = this.EntityInfo.DbTableName; + diffTable.TableDescription = this.EntityInfo.TableDescription; + diffTable.Columns = this.EntityInfo.Columns.Where(it => it.IsIgnore == false).Select(it => new DiffLogColumnInfo() + { + ColumnDescription = it.ColumnDescription, + ColumnName = it.DbColumnName, + Value = it.PropertyInfo.GetValue(this.InsertObjs.Last(), null) + }).ToList(); + return new List() { diffTable }; + } + } #endregion } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs index 5f5fe3988..5b03fb18f 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs @@ -39,8 +39,7 @@ namespace SqlSugar { return 150; } - else if (this.Context is OracleExpressionContext) - { + else if (this.Context is OracleExpressionContext) { return 401; } @@ -60,11 +59,7 @@ namespace SqlSugar } else if (this.Context is OracleExpressionContext) { - return (HasWhere ? "AND" : "WHERE") + " ROWNUM=1"; - } - else if (this.Context is PostgreSQLExpressionContext) - { - return "limit 1"; + return (HasWhere?"AND":"WHERE")+ " ROWNUM=1"; } else { diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs index f5ecde784..b5cf9bca4 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs @@ -257,19 +257,19 @@ namespace SqlSugar } return true; } - public override List GetColumnInfosByTableName(string tableName,bool isCache=true) + public override List GetColumnInfosByTableName(string tableName, bool isCache = true) { string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower(); cacheKey = GetCacheKey(cacheKey); if (!isCache) return GetColumnInfosByTableName(tableName); else - return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey, - () => - { - return GetColumnInfosByTableName(tableName); + return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey, + () => + { + return GetColumnInfosByTableName(tableName); - }); + }); } private List GetColumnInfosByTableName(string tableName) @@ -330,7 +330,7 @@ namespace SqlSugar string sql = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME =@tableName ORDER BY TABLE_NAME"; var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent; this.Context.Ado.IsEnableLogEvent = false; - var pks = this.Context.Ado.SqlQuery(sql,new { tableName=tableName.ToUpper() }); + var pks = this.Context.Ado.SqlQuery(sql, new { tableName = tableName.ToUpper() }); this.Context.Ado.IsEnableLogEvent = oldIsEnableLog; return pks; }); @@ -350,7 +350,7 @@ namespace SqlSugar this.Context.Ado.IsEnableLogEvent = oldIsEnableLog; return pks; }); - return comments.HasValue() ? comments.First(it=>it.DbColumnName.Equals(filedName,StringComparison.CurrentCultureIgnoreCase)).ColumnDescription : ""; + return comments.HasValue() ? comments.First(it => it.DbColumnName.Equals(filedName, StringComparison.CurrentCultureIgnoreCase)).ColumnDescription : ""; } @@ -364,6 +364,10 @@ namespace SqlSugar { item.Length = 50; } + if (item.DataType == "varchar" && item.Length == 0) + { + item.Length = 50; + } } } string sql = GetCreateTableSql(tableName, columns); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SimpleClient.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SimpleClient.cs index 47e54f388..cafe82786 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SimpleClient.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SimpleClient.cs @@ -80,7 +80,7 @@ namespace SqlSugar { return this.Context.Insertable(insertObjs).ExecuteCommand() > 0; } - public bool InsertRange(List[] insertObjs) where T : class, new() + public bool InsertRange(List insertObjs) where T : class, new() { return this.Context.Insertable(insertObjs).ExecuteCommand() > 0; } @@ -92,6 +92,10 @@ namespace SqlSugar { return this.Context.Updateable(updateObjs).ExecuteCommand() > 0; } + public bool UpdateRange(List updateObjs) where T : class, new() + { + return this.Context.Updateable(updateObjs).ExecuteCommand() > 0; + } public bool Update(Expression> columns, Expression> whereExpression) where T : class, new() { return this.Context.Updateable().UpdateColumns(columns).Where(whereExpression).ExecuteCommand() > 0; @@ -193,7 +197,7 @@ namespace SqlSugar { return this.Context.Insertable(insertObjs).ExecuteCommand() > 0; } - public bool InsertRange(List[] insertObjs) + public bool InsertRange(List insertObjs) { return this.Context.Insertable(insertObjs).ExecuteCommand() > 0; } @@ -205,6 +209,10 @@ namespace SqlSugar { return this.Context.Updateable(updateObjs).ExecuteCommand() > 0; } + public bool UpdateRange(List updateObjs) + { + return this.Context.Updateable(updateObjs).ExecuteCommand() > 0; + } public bool Update(Expression> columns, Expression> whereExpression) { return this.Context.Updateable().UpdateColumns(columns).Where(whereExpression).ExecuteCommand() > 0;