diff --git a/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs index 326251d4b..f395837f1 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs @@ -115,7 +115,7 @@ namespace SqlSugar .Where(ec => !dbColumns.Any(dc => dc.DbColumnName.Equals(ec.OldDbColumnName, StringComparison.CurrentCultureIgnoreCase))) .Where(ec => dbColumns.Any(dc => dc.DbColumnName.Equals(ec.DbColumnName) - && ((ec.Length != dc.Length && !PubMethod.GetUnderType(ec.PropertyInfo).IsEnum() && PubMethod.GetUnderType(ec.PropertyInfo).IsIn(UtilConstants.StringType)) || + && ((ec.Length != dc.Length && !UtilMethods.GetUnderType(ec.PropertyInfo).IsEnum() && UtilMethods.GetUnderType(ec.PropertyInfo).IsIn(UtilConstants.StringType)) || ec.IsNullable != dc.IsNullable || IsSamgeType(ec, dc)))).ToList(); var renameColumns = entityColumns @@ -212,7 +212,7 @@ namespace SqlSugar } protected virtual DbColumnInfo EntityColumnToDbColumn(EntityInfo entityInfo, string tableName, EntityColumnInfo item) { - var propertyType = PubMethod.GetUnderType(item.PropertyInfo); + var propertyType = UtilMethods.GetUnderType(item.PropertyInfo); var result = new DbColumnInfo() { TableId = entityInfo.Columns.IndexOf(item), @@ -246,7 +246,7 @@ namespace SqlSugar { return ec.DataType != dc.DataType; } - var propertyType = PubMethod.GetUnderType(ec.PropertyInfo); + var propertyType = UtilMethods.GetUnderType(ec.PropertyInfo); var properyTypeName = string.Empty; if (propertyType.IsEnum()) { diff --git a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs index 729494c52..1dbecf3aa 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs @@ -135,7 +135,7 @@ namespace SqlSugar } else { - reval.Add((T)Convert.ChangeType(re.GetValue(0),PubMethod.GetUnderType(type))); + reval.Add((T)Convert.ChangeType(re.GetValue(0),UtilMethods.GetUnderType(type))); } } } diff --git a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs index 5ad02c191..b7b806e04 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs @@ -168,7 +168,7 @@ namespace SqlSugar IDbBind bind = Context.Ado.DbBind; bool isNullableType = false; MethodInfo method = null; - Type bindPropertyType = PubMethod.GetUnderType(bindProperty, ref isNullableType); + Type bindPropertyType = UtilMethods.GetUnderType(bindProperty, ref isNullableType); string dbTypeName = DataRecord.GetDataTypeName(ordinal); if (Regex.IsMatch(dbTypeName, @"\(.+\)")) { @@ -299,7 +299,7 @@ namespace SqlSugar var isAny = invalidTypes.Contains(bindProperyTypeName); if (isAny) { - throw new SqlSugarException(string.Format("{0} can't convert {1} to {2}", propertyName, validPropertyType, bindProperyTypeName)); + throw new UtilExceptions(string.Format("{0} can't convert {1} to {2}", propertyName, validPropertyType, bindProperyTypeName)); } } #endregion diff --git a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs index 4394daeeb..05f46df72 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs @@ -189,7 +189,7 @@ namespace SqlSugar #region Sqlite Extensions public static Nullable GetSqliteTypeNull(this IDataReader dr, int i) where T : struct { - var type = PubMethod.GetUnderType(typeof(T)); + var type = UtilMethods.GetUnderType(typeof(T)); if (dr.IsDBNull(i)) { return null; diff --git a/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index a3b3c7edf..246a57c19 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -174,7 +174,7 @@ namespace SqlSugar Value = column.PropertyInfo.GetValue(item, null), DbColumnName = GetDbColumnName(column.PropertyName), PropertyName = column.PropertyName, - PropertyType = PubMethod.GetUnderType(column.PropertyInfo), + PropertyType = UtilMethods.GetUnderType(column.PropertyInfo), TableId = i }; if (columnInfo.PropertyType.IsEnum()) diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs index 89b1d3a7d..4dc31dc19 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs @@ -23,7 +23,7 @@ namespace SqlSugar { get { - _WhereInfos = PubMethod.IsNullReturnNew(_WhereInfos); + _WhereInfos = UtilMethods.IsNullReturnNew(_WhereInfos); return _WhereInfos; } set { _WhereInfos = value; } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 1bd59632e..23531b663 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -53,7 +53,7 @@ namespace SqlSugar { get { - _EasyJoinInfos = PubMethod.IsNullReturnNew(_EasyJoinInfos); + _EasyJoinInfos = UtilMethods.IsNullReturnNew(_EasyJoinInfos); return _EasyJoinInfos; } set { _EasyJoinInfos = value; } @@ -62,7 +62,7 @@ namespace SqlSugar { get { - _JoinQueryInfos = PubMethod.IsNullReturnNew(_JoinQueryInfos); + _JoinQueryInfos = UtilMethods.IsNullReturnNew(_JoinQueryInfos); return _JoinQueryInfos; } set { _JoinQueryInfos = value; } @@ -72,7 +72,7 @@ namespace SqlSugar { get { - _WhereInfos = PubMethod.IsNullReturnNew(_WhereInfos); + _WhereInfos = UtilMethods.IsNullReturnNew(_WhereInfos); return _WhereInfos; } set { _WhereInfos = value; } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs index de783427f..9f71a56a2 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs @@ -20,7 +20,7 @@ namespace SqlSugar { get { - base._SqlQueryBuilder = PubMethod.IsNullReturnNew(base._SqlQueryBuilder); + base._SqlQueryBuilder = UtilMethods.IsNullReturnNew(base._SqlQueryBuilder); return base._SqlQueryBuilder; } set { base._SqlQueryBuilder = value; } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlQueryBuilder.cs index 268a5b782..de1ebe350 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlQueryBuilder.cs @@ -41,7 +41,7 @@ namespace SqlSugar { get { - _Sql = PubMethod.IsNullReturnNew(_Sql); + _Sql = UtilMethods.IsNullReturnNew(_Sql); return _Sql; } set @@ -60,7 +60,7 @@ namespace SqlSugar { get { - _Parameters = PubMethod.IsNullReturnNew(_Parameters); + _Parameters = UtilMethods.IsNullReturnNew(_Parameters); return _Parameters; } set diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs index 50fb1e53c..61630343b 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs @@ -179,7 +179,7 @@ namespace SqlSugar Value = column.PropertyInfo.GetValue(item, null), DbColumnName = GetDbColumnName(column.PropertyName), PropertyName = column.PropertyName, - PropertyType = PubMethod.GetUnderType(column.PropertyInfo), + PropertyType = UtilMethods.GetUnderType(column.PropertyInfo), TableId = i }; if (columnInfo.PropertyType.IsEnum()) diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/CodeFirst/MySqlCodeFirst.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/CodeFirst/MySqlCodeFirst.cs index 38ac994da..9a1cb3fd5 100644 --- a/Src/Asp.Net/SqlSugar/Realization/MySql/CodeFirst/MySqlCodeFirst.cs +++ b/Src/Asp.Net/SqlSugar/Realization/MySql/CodeFirst/MySqlCodeFirst.cs @@ -26,7 +26,7 @@ namespace SqlSugar { var result = new DbColumnInfo() { - DataType = this.Context.Ado.DbBind.GetDbTypeName(PubMethod.GetUnderType(item.PropertyInfo).Name), + DataType = this.Context.Ado.DbBind.GetDbTypeName(UtilMethods.GetUnderType(item.PropertyInfo).Name), TableId = entityInfo.Columns.IndexOf(item), DbColumnName = item.DbColumnName.IsValuable() ? item.DbColumnName : item.PropertyName, IsPrimarykey = item.IsPrimarykey, diff --git a/Src/Asp.Net/SqlSugar/Realization/Sqlite/CodeFirst/SqliteCodeFirst.cs b/Src/Asp.Net/SqlSugar/Realization/Sqlite/CodeFirst/SqliteCodeFirst.cs index b093339dc..dce49d4a2 100644 --- a/Src/Asp.Net/SqlSugar/Realization/Sqlite/CodeFirst/SqliteCodeFirst.cs +++ b/Src/Asp.Net/SqlSugar/Realization/Sqlite/CodeFirst/SqliteCodeFirst.cs @@ -45,7 +45,7 @@ namespace SqlSugar { var result = new DbColumnInfo() { - DataType = this.Context.Ado.DbBind.GetDbTypeName(PubMethod.GetUnderType(item.PropertyInfo).Name), + DataType = this.Context.Ado.DbBind.GetDbTypeName(UtilMethods.GetUnderType(item.PropertyInfo).Name), TableId = entityInfo.Columns.IndexOf(item), DbColumnName = item.DbColumnName.IsValuable() ? item.DbColumnName : item.PropertyName, IsPrimarykey = item.IsPrimarykey, diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.csproj b/Src/Asp.Net/SqlSugar/SqlSugar.csproj index dbb537448..979aedb0e 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.csproj +++ b/Src/Asp.Net/SqlSugar/SqlSugar.csproj @@ -140,9 +140,9 @@ - - - + + + diff --git a/Src/Asp.Net/SqlSugar/Utilities/Check.cs b/Src/Asp.Net/SqlSugar/Utilities/Check.cs index dfd415437..cdf1c5fd9 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/Check.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/Check.cs @@ -9,31 +9,31 @@ namespace SqlSugar public static void ThrowNotSupportedException(string message) { message = message.IsNullOrEmpty() ? new NotSupportedException().Message : message; - throw new SqlSugarException("SqlSugarException.NotSupportedException:" + message); + throw new UtilExceptions("SqlSugarException.NotSupportedException:" + message); } public static void ConnectionConfig(ConnectionConfig config) { if (config == null || config.ConnectionString.IsNullOrEmpty() || config.DbType.IsNullOrEmpty()) { - throw new SqlSugarException("SqlSugarException.ArgumentNullException:" + ErrorMessage.ConnectionConfigIsNull); + throw new UtilExceptions("SqlSugarException.ArgumentNullException:" + ErrorMessage.ConnectionConfigIsNull); } } public static void ArgumentNullException(object checkObj, string message) { if (checkObj == null) - throw new SqlSugarException("SqlSugarException.ArgumentNullException:" + message); + throw new UtilExceptions("SqlSugarException.ArgumentNullException:" + message); } public static void ArgumentNullException(object [] checkObj, string message) { if (checkObj == null|| checkObj.Length==0) - throw new SqlSugarException("SqlSugarException.ArgumentNullException:" + message); + throw new UtilExceptions("SqlSugarException.ArgumentNullException:" + message); } public static void Exception(bool isException, string message, params string[] args) { if (isException) - throw new SqlSugarException(string.Format(message, args)); + throw new UtilExceptions(string.Format(message, args)); } } diff --git a/Src/Asp.Net/SqlSugar/Utilities/UtilsConvert.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs similarity index 98% rename from Src/Asp.Net/SqlSugar/Utilities/UtilsConvert.cs rename to Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs index 27d913890..ca4495679 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/UtilsConvert.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; namespace SqlSugar { - public static class UtilsConvert + public static class UtilConvert { public static int ObjToInt(this object thisValue) { diff --git a/Src/Asp.Net/SqlSugar/Utilities/SqlException.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilExceptions.cs similarity index 81% rename from Src/Asp.Net/SqlSugar/Utilities/SqlException.cs rename to Src/Asp.Net/SqlSugar/Utilities/UtilExceptions.cs index 381e2d8a7..95cd41e5c 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/SqlException.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilExceptions.cs @@ -5,18 +5,18 @@ using System.Text; using Newtonsoft.Json; namespace SqlSugar { - public class SqlSugarException : Exception + public class UtilExceptions : Exception { - public SqlSugarException(string message) + public UtilExceptions(string message) : base(message){} - public SqlSugarException(SqlSugarClient context,string message, string sql) + public UtilExceptions(SqlSugarClient context,string message, string sql) : base(GetMessage(context, message, sql)) {} - public SqlSugarException(SqlSugarClient context, string message, string sql, object pars) + public UtilExceptions(SqlSugarClient context, string message, string sql, object pars) : base(GetMessage(context,message, sql, pars)){} - public SqlSugarException(SqlSugarClient context, string message, object pars) + public UtilExceptions(SqlSugarClient context, string message, object pars) : base(GetMessage(context,message, pars)){} private static string GetMessage(SqlSugarClient context, string message, object pars) diff --git a/Src/Asp.Net/SqlSugar/Utilities/PubMethod.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs similarity index 98% rename from Src/Asp.Net/SqlSugar/Utilities/PubMethod.cs rename to Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs index ad29b2609..f45ec08ff 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/PubMethod.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs @@ -7,7 +7,7 @@ using System.Reflection; using System.Text; namespace SqlSugar { - public class PubMethod + public class UtilMethods { internal static Type GetUnderType(Type oldType) { @@ -36,7 +36,6 @@ namespace SqlSugar return unType != null; } - internal static T IsNullReturnNew(T returnObj) where T : new() { if (returnObj.IsNullOrEmpty())