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

Code optimization

Browse Source
This commit is contained in:
sunkaixuan 2018-01-31 16:41:30 +08:00
parent f56a33aba3
commit a4fc0e7ece
12 changed files with 166 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs
View File

@ -58,50 +58,50 @@ namespace SqlSugar
protected List<T> GetKeyValueList<T>(Type type, IDataReader dataReader)
{
List<T> reval = new List<T>();
List<T> result = new List<T>();
while (dataReader.Read())
{
if (UtilConstants.DicOO == type)
{
var kv = new KeyValuePair<object, object>(dataReader.GetValue(0), dataReader.GetValue(1));
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<object, object>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<object, object>)));
}
else if (UtilConstants.DicIS == type)
{
var kv = new KeyValuePair<int, string>(dataReader.GetValue(0).ObjToInt(), dataReader.GetValue(1).ObjToString());
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<int, string>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<int, string>)));
}
else if (UtilConstants.Dicii == type)
{
var kv = new KeyValuePair<int, int>(dataReader.GetValue(0).ObjToInt(), dataReader.GetValue(1).ObjToInt());
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<int, int>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<int, int>)));
}
else if (UtilConstants.DicSi == type)
{
var kv = new KeyValuePair<string, int>(dataReader.GetValue(0).ObjToString(), dataReader.GetValue(1).ObjToInt());
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, int>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, int>)));
}
else if (UtilConstants.DicSo == type)
{
var kv = new KeyValuePair<string, object>(dataReader.GetValue(0).ObjToString(), dataReader.GetValue(1));
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, object>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, object>)));
}
else if (UtilConstants.DicSS == type)
{
var kv = new KeyValuePair<string, string>(dataReader.GetValue(0).ObjToString(), dataReader.GetValue(1).ObjToString());
reval.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, string>)));
result.Add((T)Convert.ChangeType(kv, typeof(KeyValuePair<string, string>)));
}
else
{
Check.Exception(true, ErrorMessage.NotSupportedDictionary);
}
}
return reval;
return result;
}
protected List<T> GetArrayList<T>(Type type, IDataReader dataReader)
{
List<T> reval = new List<T>();
List<T> result = new List<T>();
int count = dataReader.FieldCount;
var childType = type.GetElementType();
while (dataReader.Read())
@ -112,30 +112,30 @@ namespace SqlSugar
array[i] = Convert.ChangeType(dataReader.GetValue(i), childType);
}
if (childType == UtilConstants.StringType)
reval.Add((T)Convert.ChangeType(array.Select(it => it.ObjToString()).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it.ObjToString()).ToArray(), type));
else if (childType == UtilConstants.ObjType)
reval.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? null : (object)it).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? null : (object)it).ToArray(), type));
else if (childType == UtilConstants.BoolType)
reval.Add((T)Convert.ChangeType(array.Select(it => it.ObjToBool()).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it.ObjToBool()).ToArray(), type));
else if (childType == UtilConstants.ByteType)
reval.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? 0 : (byte)it).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? 0 : (byte)it).ToArray(), type));
else if (childType == UtilConstants.DecType)
reval.Add((T)Convert.ChangeType(array.Select(it => it.ObjToDecimal()).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it.ObjToDecimal()).ToArray(), type));
else if (childType == UtilConstants.GuidType)
reval.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? Guid.Empty : (Guid)it).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? Guid.Empty : (Guid)it).ToArray(), type));
else if (childType == UtilConstants.DateType)
reval.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? DateTime.MinValue : (DateTime)it).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it == DBNull.Value ? DateTime.MinValue : (DateTime)it).ToArray(), type));
else if (childType == UtilConstants.IntType)
reval.Add((T)Convert.ChangeType(array.Select(it => it.ObjToInt()).ToArray(), type));
result.Add((T)Convert.ChangeType(array.Select(it => it.ObjToInt()).ToArray(), type));
else
Check.Exception(true, ErrorMessage.NotSupportedArray);
}
return reval;
return result;
}
protected List<T> GetValueTypeList<T>(Type type, IDataReader dataReader)
{
List<T> reval = new List<T>();
List<T> result = new List<T>();
while (dataReader.Read())
{
var value = dataReader.GetValue(0);
@ -145,18 +145,18 @@ namespace SqlSugar
}
if (value == DBNull.Value)
{
reval.Add(default(T));
result.Add(default(T));
}
else if (type.IsEnum)
{
reval.Add((T)Enum.Parse(type, value.ObjToString()));
result.Add((T)Enum.Parse(type, value.ObjToString()));
}
else
{
reval.Add((T)Convert.ChangeType(value, UtilMethods.GetUnderType(type)));
result.Add((T)Convert.ChangeType(value, UtilMethods.GetUnderType(type)));
}
}
return reval;
return result;
}
}
}

30
Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs
View File

@ -37,12 +37,12 @@ namespace SqlSugar
}
public virtual string GetConvertString(string dbTypeName)
{
string reval = string.Empty;
string result = string.Empty;
switch (dbTypeName.ToLower())
{
#region Int
case "int":
reval = "Convert.ToInt32";
result = "Convert.ToInt32";
break;
#endregion
@ -53,19 +53,19 @@ namespace SqlSugar
case "nvarchar":
case "varchar":
case "text":
reval = "Convert.ToString";
result = "Convert.ToString";
break;
#endregion
#region Long
case "bigint":
reval = "Convert.ToInt64";
result = "Convert.ToInt64";
break;
#endregion
#region Bool
case "bit":
reval = "Convert.ToBoolean";
result = "Convert.ToBoolean";
break;
#endregion
@ -76,7 +76,7 @@ namespace SqlSugar
case "datetime":
case "date":
case "datetime2":
reval = "Convert.ToDateTime";
result = "Convert.ToDateTime";
break;
#endregion
@ -86,13 +86,13 @@ namespace SqlSugar
case "numeric":
case "money":
case "decimal":
reval = "Convert.ToDecimal";
result = "Convert.ToDecimal";
break;
#endregion
#region Double
case "float":
reval = "Convert.ToDouble";
result = "Convert.ToDouble";
break;
#endregion
@ -100,42 +100,42 @@ namespace SqlSugar
case "varbinary":
case "binary":
case "image":
reval = "byte[]";
result = "byte[]";
break;
#endregion
#region Float
case "real":
reval = "Convert.ToSingle";
result = "Convert.ToSingle";
break;
#endregion
#region Short
case "smallint":
reval = "Convert.ToInt16";
result = "Convert.ToInt16";
break;
#endregion
#region Byte
case "tinyint":
reval = "Convert.ToByte";
result = "Convert.ToByte";
break;
#endregion
#region Guid
case "uniqueidentifier":
reval = "Guid.Parse";
result = "Guid.Parse";
break;
#endregion
#region Null
default:
reval = null;
result = null;
break;
#endregion
}
return reval;
return result;
}
public virtual string GetPropertyTypeName(string dbTypeName)
{

74
Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs
View File

@ -11,8 +11,8 @@ namespace SqlSugar
#region Common Extensions
public static Guid GetStringGuid(this IDataRecord dr, int i)
{
var reval = Guid.Parse(dr.GetValue(i).ToString());
return reval;
var result = Guid.Parse(dr.GetValue(i).ToString());
return result;
}
public static Guid? GetConvertStringGuid(this IDataRecord dr, int i)
@ -21,14 +21,14 @@ namespace SqlSugar
{
return Guid.Empty;
}
var reval = Guid.Parse(dr.GetValue(i).ToString());
return reval;
var result = Guid.Parse(dr.GetValue(i).ToString());
return result;
}
public static bool? GetConvertBoolean(this IDataRecord dr, int i)
{
var reval = dr.GetBoolean(i);
return reval;
var result = dr.GetBoolean(i);
return result;
}
public static byte? GetConvertByte(this IDataRecord dr, int i)
@ -37,8 +37,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetByte(i);
return reval;
var result = dr.GetByte(i);
return result;
}
public static char? GetConvertChar(this IDataRecord dr, int i)
@ -47,18 +47,18 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetChar(i);
return reval;
var result = dr.GetChar(i);
return result;
}
public static DateTime? GetConvertDateTime(this IDataRecord dr, int i)
{
var reval = dr.GetDateTime(i);
if (reval == DateTime.MinValue)
var result = dr.GetDateTime(i);
if (result == DateTime.MinValue)
{
return null; ;
}
return reval;
return result;
}
public static decimal? GetConvertDecimal(this IDataRecord dr, int i)
@ -67,8 +67,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetDecimal(i);
return reval;
var result = dr.GetDecimal(i);
return result;
}
@ -78,8 +78,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetDouble(i);
return reval;
var result = dr.GetDouble(i);
return result;
}
public static Guid? GetConvertGuid(this IDataRecord dr, int i)
@ -88,8 +88,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetGuid(i);
return reval;
var result = dr.GetGuid(i);
return result;
}
public static short? GetConvertInt16(this IDataRecord dr, int i)
@ -98,8 +98,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetInt16(i);
return reval;
var result = dr.GetInt16(i);
return result;
}
public static Int32? GetConvertInt32(this IDataRecord dr, int i)
@ -108,8 +108,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetInt32(i);
return reval;
var result = dr.GetInt32(i);
return result;
}
public static long? GetConvetInt64(this IDataRecord dr, int i)
@ -118,8 +118,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetInt64(i);
return reval;
var result = dr.GetInt64(i);
return result;
}
public static float? GetConvertFloat(this IDataRecord dr, int i)
@ -128,8 +128,8 @@ namespace SqlSugar
{
return null;
}
var reval = dr.GetFloat(i);
return reval;
var result = dr.GetFloat(i);
return result;
}
public static DateTime GetdatetimeoffsetDate(this IDataRecord dr, int i)
@ -139,8 +139,8 @@ namespace SqlSugar
return DateTime.MinValue;
}
var offsetValue = (DateTimeOffset)dr.GetValue(i);
var reval = offsetValue.DateTime;
return reval;
var result = offsetValue.DateTime;
return result;
}
public static DateTime? GetConvertdatetimeoffsetDate(this IDataRecord dr, int i)
@ -150,8 +150,8 @@ namespace SqlSugar
return DateTime.MinValue;
}
var offsetValue = (DateTimeOffset)dr.GetValue(i);
var reval = offsetValue.DateTime;
return reval;
var result = offsetValue.DateTime;
return result;
}
public static DateTimeOffset Getdatetimeoffset(this IDataRecord dr, int i)
@ -160,8 +160,8 @@ namespace SqlSugar
{
return default(DateTimeOffset);
}
var reval = (DateTimeOffset)dr.GetValue(i);
return reval;
var result = (DateTimeOffset)dr.GetValue(i);
return result;
}
public static DateTimeOffset? GetConvertdatetimeoffset(this IDataRecord dr, int i)
@ -170,8 +170,8 @@ namespace SqlSugar
{
return default(DateTimeOffset);
}
var reval = (DateTimeOffset)dr.GetValue(i);
return reval;
var result = (DateTimeOffset)dr.GetValue(i);
return result;
}
@ -181,8 +181,8 @@ namespace SqlSugar
{
return null;
}
var reval = Convert.ToString(dr.GetValue(i));
return reval;
var result = Convert.ToString(dr.GetValue(i));
return result;
}
public static Nullable<T> GetOtherNull<T>(this IDataReader dr, int i) where T : struct

4
Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
View File

@ -211,9 +211,9 @@ namespace SqlSugar
{
var isEnableLogEvent = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var reval = this.Context.Ado.SqlQuery<T>(sql);
var result = this.Context.Ado.SqlQuery<T>(sql);
this.Context.Ado.IsEnableLogEvent = isEnableLogEvent;
return reval;
return result;
});
}
protected virtual string GetCreateTableSql(string tableName, List<DbColumnInfo> columns)

54
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -354,22 +354,22 @@ namespace SqlSugar
QueryBuilder.Skip = null;
QueryBuilder.Take = null;
QueryBuilder.OrderByValue = null;
var reval = this.ToList();
var result = this.ToList();
QueryBuilder.Skip = oldSkip;
QueryBuilder.Take = oldTake;
QueryBuilder.OrderByValue = oldOrderBy;
if (reval == null || reval.Count == 0)
if (result == null || result.Count == 0)
{
return default(T);
}
else if (reval.Count == 2)
else if (result.Count == 2)
{
Check.Exception(true, ".Single() result must not exceed one . You can use.First()");
return default(T);
}
else
{
return reval.SingleOrDefault();
return result.SingleOrDefault();
}
}
public virtual T Single(Expression<Func<T, bool>> expression)
@ -395,9 +395,9 @@ namespace SqlSugar
{
QueryBuilder.Skip = 0;
QueryBuilder.Take = 1;
var reval = this.ToList();
if (reval.HasValue())
return reval.FirstOrDefault();
var result = this.ToList();
if (result.HasValue())
return result.FirstOrDefault();
else
return default(T);
}
@ -428,11 +428,11 @@ namespace SqlSugar
}
public virtual ISugarQueryable<TResult> Select<TResult>(string selectValue)
{
var reval = InstanceFactory.GetQueryable<TResult>(this.Context.CurrentConnectionConfig);
reval.Context = this.Context;
reval.SqlBuilder = this.SqlBuilder;
var result = InstanceFactory.GetQueryable<TResult>(this.Context.CurrentConnectionConfig);
result.Context = this.Context;
result.SqlBuilder = this.SqlBuilder;
QueryBuilder.SelectValue = selectValue;
return reval;
return result;
}
public virtual ISugarQueryable<T> Select(string selectValue)
{
@ -484,8 +484,8 @@ namespace SqlSugar
public virtual TResult Max<TResult>(string maxField)
{
this.Select(string.Format(QueryBuilder.MaxTemplate, maxField));
var reval = this._ToList<TResult>().SingleOrDefault();
return reval;
var result = this._ToList<TResult>().SingleOrDefault();
return result;
}
public virtual TResult Max<TResult>(Expression<Func<T, TResult>> expression)
{
@ -495,8 +495,8 @@ namespace SqlSugar
public virtual TResult Min<TResult>(string minField)
{
this.Select(string.Format(QueryBuilder.MinTemplate, minField));
var reval = this._ToList<TResult>().SingleOrDefault();
return reval;
var result = this._ToList<TResult>().SingleOrDefault();
return result;
}
public virtual TResult Min<TResult>(Expression<Func<T, TResult>> expression)
{
@ -506,8 +506,8 @@ namespace SqlSugar
public virtual TResult Sum<TResult>(string sumField)
{
this.Select(string.Format(QueryBuilder.SumTemplate, sumField));
var reval = this._ToList<TResult>().SingleOrDefault();
return reval;
var result = this._ToList<TResult>().SingleOrDefault();
return result;
}
public virtual TResult Sum<TResult>(Expression<Func<T, TResult>> expression)
{
@ -517,8 +517,8 @@ namespace SqlSugar
public virtual TResult Avg<TResult>(string avgField)
{
this.Select(string.Format(QueryBuilder.AvgTemplate, avgField));
var reval = this._ToList<TResult>().SingleOrDefault();
return reval;
var result = this._ToList<TResult>().SingleOrDefault();
return result;
}
public virtual TResult Avg<TResult>(Expression<Func<T, TResult>> expression)
{
@ -942,12 +942,12 @@ namespace SqlSugar
}
protected ISugarQueryable<TResult> _Select<TResult>(Expression expression)
{
var reval = InstanceFactory.GetQueryable<TResult>(this.Context.CurrentConnectionConfig);
reval.Context = this.Context;
reval.SqlBuilder = this.SqlBuilder;
reval.SqlBuilder.QueryBuilder.Parameters = QueryBuilder.Parameters;
reval.SqlBuilder.QueryBuilder.SelectValue = expression;
return reval;
var result = InstanceFactory.GetQueryable<TResult>(this.Context.CurrentConnectionConfig);
result.Context = this.Context;
result.SqlBuilder = this.SqlBuilder;
result.SqlBuilder.QueryBuilder.Parameters = QueryBuilder.Parameters;
result.SqlBuilder.QueryBuilder.SelectValue = expression;
return result;
}
protected void _Where(Expression expression)
{
@ -1077,8 +1077,8 @@ namespace SqlSugar
ToSqlBefore();
sql = QueryBuilder.ToSqlString();
sql = QueryBuilder.ToCountSql(sql);
var reval = Context.Ado.GetInt(sql, QueryBuilder.Parameters.ToArray());
return reval;
var result = Context.Ado.GetInt(sql, QueryBuilder.Parameters.ToArray());
return result;
}
private void ToSqlBefore()

4
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs
View File

@ -161,8 +161,8 @@ namespace SqlSugar
if (this.Parameters == null)
this.Parameters = new List<SugarParameter>();
this.Parameters.AddRange(resolveExpress.Parameters);
var reval = resolveExpress.Result;
return reval;
var result = resolveExpress.Result;
return result;
}
#endregion
}

4
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs
View File

@ -105,8 +105,8 @@ namespace SqlSugar
resolveExpress.SqlFuncServices = Context.CurrentConnectionConfig.ConfigureExternalServices == null ? null : Context.CurrentConnectionConfig.ConfigureExternalServices.SqlFuncServices;
resolveExpress.Resolve(expression, resolveType);
this.Parameters.AddRange(resolveExpress.Parameters);
var reval = resolveExpress.Result;
return reval;
var result = resolveExpress.Result;
return result;
}
public virtual string ToSqlString()
{

32
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@ -230,13 +230,13 @@ namespace SqlSugar
};
resolveExpress.Resolve(expression, resolveType);
this.Parameters.AddRange(resolveExpress.Parameters);
var reval = resolveExpress.Result;
var result = resolveExpress.Result;
var isSingleTableHasSubquery = IsSingle() && resolveExpress.SingleTableNameSubqueryShortName.HasValue();
if (isSingleTableHasSubquery) {
Check.Exception(!string.IsNullOrEmpty(this.TableShortName) && resolveExpress.SingleTableNameSubqueryShortName != this.TableShortName, "{0} and {1} need same name");
this.TableShortName = resolveExpress.SingleTableNameSubqueryShortName;
}
return reval;
return result;
}
public virtual string ToSqlString()
{
@ -360,32 +360,32 @@ namespace SqlSugar
{
get
{
string reval = string.Empty;
string result = string.Empty;
if (this.SelectValue == null || this.SelectValue is string)
{
reval = GetSelectValueByString();
result = GetSelectValueByString();
}
else
{
reval = GetSelectValueByExpression();
result = GetSelectValueByExpression();
}
if (this.SelectType == ResolveExpressType.SelectMultiple)
{
this.SelectCacheKey = this.SelectCacheKey + string.Join("-", this._JoinQueryInfos.Select(it => it.TableName));
}
return reval;
return result;
}
}
public virtual string GetSelectValueByExpression()
{
var expression = this.SelectValue as Expression;
var reval = GetExpressionValue(expression, this.SelectType).GetResultString();
this.SelectCacheKey = reval;
return reval;
var result = GetExpressionValue(expression, this.SelectType).GetResultString();
this.SelectCacheKey = result;
return result;
}
public virtual string GetSelectValueByString()
{
string reval;
string result;
if (this.SelectValue.IsNullOrEmpty())
{
string pre = null;
@ -393,18 +393,18 @@ namespace SqlSugar
{
pre = Builder.GetTranslationColumnName(TableShortName) + ".";
}
reval = string.Join(",", this.Context.EntityMaintenance.GetEntityInfo(this.EntityType).Columns.Where(it => !it.IsIgnore).Select(it => pre + Builder.GetTranslationColumnName(it.EntityName, it.PropertyName)));
result = string.Join(",", this.Context.EntityMaintenance.GetEntityInfo(this.EntityType).Columns.Where(it => !it.IsIgnore).Select(it => pre + Builder.GetTranslationColumnName(it.EntityName, it.PropertyName)));
}
else
{
reval = this.SelectValue.ObjToString();
this.SelectCacheKey = reval;
result = this.SelectValue.ObjToString();
this.SelectCacheKey = result;
}
if (reval.IsNullOrEmpty())
if (result.IsNullOrEmpty())
{
reval = "*";
result = "*";
}
return reval;
return result;
}
public virtual string GetWhereValueString
{

4
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/UpdateBuilder.cs
View File

@ -122,8 +122,8 @@ namespace SqlSugar
}
resolveExpress.Resolve(expression, resolveType);
this.Parameters.AddRange(resolveExpress.Parameters);
var reval = resolveExpress.Result;
return reval;
var result = resolveExpress.Result;
return result;
}
public virtual string ToSqlString()
{

52
Src/Asp.Net/SqlSugar/Infrastructure/SqlSugarAccessory.cs
View File

@ -156,8 +156,8 @@ namespace SqlSugar
var entityInfo = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate<EntityInfo>(cacheKey,
() =>
{
var reval = this.Context.EntityMaintenance.GetEntityInfo(type);
return reval;
var result = this.Context.EntityMaintenance.GetEntityInfo(type);
return result;
});
var copyObj = CopyEntityInfo(entityInfo);
InitMppingInfo(copyObj);
@ -267,45 +267,45 @@ namespace SqlSugar
}
protected InsertableProvider<T> CreateInsertable<T>(T[] insertObjs) where T : class, new()
{
var reval = InstanceFactory.GetInsertableProvider<T>(this.CurrentConnectionConfig);
var result = InstanceFactory.GetInsertableProvider<T>(this.CurrentConnectionConfig);
var sqlBuilder = InstanceFactory.GetSqlbuilder(this.CurrentConnectionConfig); ;
reval.Context = this.Context;
reval.EntityInfo = this.Context.EntityMaintenance.GetEntityInfo<T>();
reval.SqlBuilder = sqlBuilder;
reval.InsertObjs = insertObjs;
sqlBuilder.InsertBuilder = reval.InsertBuilder = InstanceFactory.GetInsertBuilder(this.CurrentConnectionConfig);
result.Context = this.Context;
result.EntityInfo = this.Context.EntityMaintenance.GetEntityInfo<T>();
result.SqlBuilder = sqlBuilder;
result.InsertObjs = insertObjs;
sqlBuilder.InsertBuilder = result.InsertBuilder = InstanceFactory.GetInsertBuilder(this.CurrentConnectionConfig);
sqlBuilder.InsertBuilder.Builder = sqlBuilder;
sqlBuilder.InsertBuilder.LambdaExpressions = InstanceFactory.GetLambdaExpressions(this.CurrentConnectionConfig);
sqlBuilder.Context = reval.SqlBuilder.InsertBuilder.Context = this.Context;
reval.Init();
return reval;
sqlBuilder.Context = result.SqlBuilder.InsertBuilder.Context = this.Context;
result.Init();
return result;
}
protected DeleteableProvider<T> CreateDeleteable<T>() where T : class, new()
{
var reval = InstanceFactory.GetDeleteableProvider<T>(this.CurrentConnectionConfig);
var result = InstanceFactory.GetDeleteableProvider<T>(this.CurrentConnectionConfig);
var sqlBuilder = InstanceFactory.GetSqlbuilder(this.CurrentConnectionConfig); ;
reval.Context = this.Context;
reval.SqlBuilder = sqlBuilder;
sqlBuilder.DeleteBuilder = reval.DeleteBuilder = InstanceFactory.GetDeleteBuilder(this.CurrentConnectionConfig);
result.Context = this.Context;
result.SqlBuilder = sqlBuilder;
sqlBuilder.DeleteBuilder = result.DeleteBuilder = InstanceFactory.GetDeleteBuilder(this.CurrentConnectionConfig);
sqlBuilder.DeleteBuilder.Builder = sqlBuilder;
sqlBuilder.DeleteBuilder.LambdaExpressions = InstanceFactory.GetLambdaExpressions(this.CurrentConnectionConfig);
sqlBuilder.Context = reval.SqlBuilder.DeleteBuilder.Context = this.Context;
return reval;
sqlBuilder.Context = result.SqlBuilder.DeleteBuilder.Context = this.Context;
return result;
}
protected UpdateableProvider<T> CreateUpdateable<T>(T[] UpdateObjs) where T : class, new()
{
var reval = InstanceFactory.GetUpdateableProvider<T>(this.CurrentConnectionConfig);
var result = InstanceFactory.GetUpdateableProvider<T>(this.CurrentConnectionConfig);
var sqlBuilder = InstanceFactory.GetSqlbuilder(this.CurrentConnectionConfig); ;
reval.Context = this.Context;
reval.EntityInfo = this.Context.EntityMaintenance.GetEntityInfo<T>();
reval.SqlBuilder = sqlBuilder;
reval.UpdateObjs = UpdateObjs;
sqlBuilder.UpdateBuilder = reval.UpdateBuilder = InstanceFactory.GetUpdateBuilder(this.CurrentConnectionConfig);
result.Context = this.Context;
result.EntityInfo = this.Context.EntityMaintenance.GetEntityInfo<T>();
result.SqlBuilder = sqlBuilder;
result.UpdateObjs = UpdateObjs;
sqlBuilder.UpdateBuilder = result.UpdateBuilder = InstanceFactory.GetUpdateBuilder(this.CurrentConnectionConfig);
sqlBuilder.UpdateBuilder.Builder = sqlBuilder;
sqlBuilder.UpdateBuilder.LambdaExpressions = InstanceFactory.GetLambdaExpressions(this.CurrentConnectionConfig);
sqlBuilder.Context = reval.SqlBuilder.UpdateBuilder.Context = this.Context;
reval.Init();
return reval;
sqlBuilder.Context = result.SqlBuilder.UpdateBuilder.Context = this.Context;
result.Init();
return result;
}
protected void CreateQueryJoin<T>(Expression joinExpression, Type[] types, ISugarQueryable<T> queryable) where T : class, new()

8
Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs
View File

@ -71,20 +71,20 @@ namespace SqlSugar
{
get
{
string reval = string.Empty;
string result = string.Empty;
if (this.SelectValue == null || this.SelectValue is string)
{
reval = GetSelectValueByString();
result = GetSelectValueByString();
}
else
{
reval = GetSelectValueByExpression();
result = GetSelectValueByExpression();
}
if (this.SelectType == ResolveExpressType.SelectMultiple)
{
this.SelectCacheKey = this.SelectCacheKey + string.Join("-", this.JoinQueryInfos.Select(it => it.TableName));
}
return reval;
return result;
}
}

20
Src/Asp.Net/SqlSugar/SqlSugarClient.cs
View File

@ -55,10 +55,10 @@ namespace SqlSugar
{
if (this.ContextAdo == null)
{
var reval = InstanceFactory.GetAdo(this.Context.CurrentConnectionConfig);
this.ContextAdo = reval;
reval.Context = this.Context;
return reval;
var result = InstanceFactory.GetAdo(this.Context.CurrentConnectionConfig);
this.ContextAdo = result;
result.Context = this.Context;
return result;
}
return this.Context._Ado;
}
@ -409,8 +409,8 @@ namespace SqlSugar
public virtual IInsertable<T> Insertable<T>(T[] insertObjs) where T : class, new()
{
InitMppingInfo<T>();
InsertableProvider<T> reval = this.CreateInsertable(insertObjs);
return reval;
InsertableProvider<T> result = this.CreateInsertable(insertObjs);
return result;
}
public virtual IInsertable<T> Insertable<T>(List<T> insertObjs) where T : class, new()
{
@ -450,8 +450,8 @@ namespace SqlSugar
public virtual IDeleteable<T> Deleteable<T>() where T : class, new()
{
InitMppingInfo<T>();
DeleteableProvider<T> reval = this.CreateDeleteable<T>();
return reval;
DeleteableProvider<T> result = this.CreateDeleteable<T>();
return result;
}
public virtual IDeleteable<T> Deleteable<T>(Expression<Func<T, bool>> expression) where T : class, new()
{
@ -489,8 +489,8 @@ namespace SqlSugar
public virtual IUpdateable<T> Updateable<T>(T[] UpdateObjs) where T : class, new()
{
InitMppingInfo<T>();
UpdateableProvider<T> reval = this.CreateUpdateable(UpdateObjs);
return reval;
UpdateableProvider<T> result = this.CreateUpdateable(UpdateObjs);
return result;
}
public virtual IUpdateable<T> Updateable<T>(List<T> UpdateObjs) where T : class, new()
{