diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs index 17830f172..1dc8aef38 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs @@ -311,7 +311,8 @@ namespace SqlSugar sqlCommand.Parameters.Clear(); ExecuteAfter(sql, parameters); SetConnectionEnd(sql); - //sqlCommand.Dispose(); + if (this.Context.CurrentConnectionConfig.DbType == DbType.Sqlite) + sqlCommand.Dispose(); return sqlDataReader; } catch (Exception ex) @@ -445,7 +446,8 @@ namespace SqlSugar sqlCommand.Parameters.Clear(); ExecuteAfter(sql, parameters); SetConnectionEnd(sql); - //sqlCommand.Dispose(); + if (this.Context.CurrentConnectionConfig.DbType == DbType.Sqlite) + sqlCommand.Dispose(); return sqlDataReader; } catch (Exception ex) diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index 823cd8cc1..5e8390350 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -191,16 +191,28 @@ namespace SqlSugar public IDeleteable Where(string whereString, SugarParameter parameter) { + if (DeleteBuilder.Parameters == null) + { + DeleteBuilder.Parameters = new List(); + } DeleteBuilder.Parameters.Add(parameter); return this; } public IDeleteable Where(string whereString, SugarParameter[] parameters) { + if (DeleteBuilder.Parameters == null) + { + DeleteBuilder.Parameters = new List(); + } DeleteBuilder.Parameters.AddRange(parameters); return this; } public IDeleteable Where(string whereString, List parameters) { + if (DeleteBuilder.Parameters == null) + { + DeleteBuilder.Parameters = new List(); + } DeleteBuilder.Parameters.AddRange(parameters); return this; } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs index c34bb5abf..0250dd538 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs @@ -965,7 +965,12 @@ namespace SqlSugar addParameters.Add(parameter); } parsmeters.AddRange(addParameters); - itemSql = itemSql.TrimEnd(';')+";"; + itemSql = itemSql + .TrimEnd('\r') + .TrimEnd('\n') + .TrimEnd('\r') + .TrimEnd('\n') + .TrimEnd(';')+";"; sqlBuilder.AppendLine(itemSql); index++; } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IDbFirst.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IDbFirst.cs index 977afe120..0cc4302a2 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IDbFirst.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IDbFirst.cs @@ -15,12 +15,12 @@ namespace SqlSugar IDbFirst SettingNamespaceTemplate(Func func); RazorFirst UseRazorAnalysis(string razorClassString, string classNamespace = "Models"); IDbFirst IsCreateAttribute(bool isCreateAttribute = true); - IDbFirst IsCreateDefaultValue(bool isCreateDefaultValue=true); + IDbFirst IsCreateDefaultValue(bool isCreateDefaultValue = true); IDbFirst Where(params string[] objectNames); - IDbFirst Where(Func func); + IDbFirst Where(Func func); IDbFirst WhereColumns(Func func); IDbFirst Where(DbObjectType dbObjectType); - void CreateClassFile(string directoryPath, string nameSpace = "Models"); + void CreateClassFile(string directoryPath, string nameSpace = "Models"); Dictionary ToClassStringList(string nameSpace = "Models"); void Init(); } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Utilities/UtilConvert.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Utilities/UtilConvert.cs index ca4495679..6b0d9dcf4 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Utilities/UtilConvert.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Utilities/UtilConvert.cs @@ -10,6 +10,10 @@ namespace SqlSugar { int reval = 0; if (thisValue == null) return 0; + if (thisValue is Enum) + { + return (int)thisValue; + } if (thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval)) { return reval; @@ -20,6 +24,10 @@ namespace SqlSugar public static int ObjToInt(this object thisValue, int errorValue) { int reval = 0; + if (thisValue is Enum) + { + return (int)thisValue; + } if (thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval)) { return reval;