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

-

Browse Source
This commit is contained in:
sunkaixuan 2017-10-10 19:49:16 +08:00
parent 11d43fbc57
commit 228db65a9a
44 changed files with 111 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
View File

@ -609,7 +609,7 @@ namespace SqlSugar
}
public virtual void ExecuteAfter(string sql, SugarParameter[] parameters)
{
var hasParameter = parameters.IsValuable();
var hasParameter = parameters.HasValue();
if (hasParameter)
{
foreach (var outputParameter in parameters.Where(it => it.Direction == ParameterDirection.Output))

10
Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
View File

@ -38,7 +38,7 @@ namespace SqlSugar
}
public virtual void InitTables(Type[] entityTypes)
{
if (entityTypes.IsValuable())
if (entityTypes.HasValue())
{
foreach (var item in entityTypes)
{
@ -53,7 +53,7 @@ namespace SqlSugar
}
public virtual void InitTables(params string[] entitiesNamespaces)
{
if (entitiesNamespaces.IsValuable())
if (entitiesNamespaces.HasValue())
{
foreach (var item in entitiesNamespaces)
{
@ -79,7 +79,7 @@ namespace SqlSugar
var tableName = GetTableName(entityInfo);
Check.Exception(entityInfo.Columns.Where(it => it.IsPrimarykey).Count() > 1, "Use Code First ,The primary key must not exceed 1");
List<DbColumnInfo> columns = new List<DbColumnInfo>();
if (entityInfo.Columns.IsValuable())
if (entityInfo.Columns.HasValue())
{
foreach (var item in entityInfo.Columns.Where(it => it.IsIgnore == false))
{
@ -96,7 +96,7 @@ namespace SqlSugar
}
public virtual void ExistLogic(EntityInfo entityInfo)
{
if (entityInfo.Columns.IsValuable())
if (entityInfo.Columns.HasValue())
{
Check.Exception(entityInfo.Columns.Where(it => it.IsPrimarykey).Count() > 1, "Use Code First ,The primary key must not exceed 1");
@ -216,7 +216,7 @@ namespace SqlSugar
var result = new DbColumnInfo()
{
TableId = entityInfo.Columns.IndexOf(item),
DbColumnName = item.DbColumnName.IsValuable() ? item.DbColumnName : item.PropertyName,
DbColumnName = item.DbColumnName.HasValue() ? item.DbColumnName : item.PropertyName,
IsPrimarykey = item.IsPrimarykey,
IsIdentity = item.IsIdentity,
TableName = tableName,

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

@ -30,12 +30,12 @@ namespace SqlSugar
if (csharpTypeName == "Boolean")
csharpTypeName = "bool";
var mappings = this.MappingTypes.Where(it => it.Value.ToString().Equals(csharpTypeName, StringComparison.CurrentCultureIgnoreCase));
return mappings.IsValuable() ? mappings.First().Key : "varchar";
return mappings.HasValue() ? mappings.First().Key : "varchar";
}
public string GetCsharpTypeName(string dbTypeName)
{
var mappings = this.MappingTypes.Where(it => it.Key == dbTypeName);
return mappings.IsValuable() ? mappings.First().Key : "string";
return mappings.HasValue() ? mappings.First().Key : "string";
}
public virtual string GetConvertString(string dbTypeName)
{

26
Src/Asp.Net/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs
View File

@ -46,7 +46,7 @@ namespace SqlSugar
}
this.TableInfoList = this.Context.Utilities.TranslateCopy(this.Context.DbMaintenance.GetTableInfoList());
var viewList = this.Context.Utilities.TranslateCopy(this.Context.DbMaintenance.GetViewInfoList());
if (viewList.IsValuable())
if (viewList.HasValue())
{
this.TableInfoList.AddRange(viewList);
}
@ -119,7 +119,7 @@ namespace SqlSugar
public IDbFirst Where(params string[] objectNames)
{
if (objectNames.IsValuable())
if (objectNames.HasValue())
{
this.TableInfoList = this.TableInfoList.Where(it => objectNames.Contains(it.Name)).ToList();
}
@ -132,7 +132,7 @@ namespace SqlSugar
{
this.Namespace = nameSpace;
Dictionary<string, string> result = new Dictionary<string, string>();
if (this.TableInfoList.IsValuable())
if (this.TableInfoList.HasValue())
{
foreach (var tableInfo in this.TableInfoList)
{
@ -150,7 +150,7 @@ namespace SqlSugar
{
string classText;
var columns = this.Context.DbMaintenance.GetColumnInfosByTableName(tableInfo.Name);
if (this.Context.IgnoreColumns.IsValuable())
if (this.Context.IgnoreColumns.HasValue())
{
var entityName = this.Context.EntityMaintenance.GetEntityName(tableInfo.Name);
columns = columns.Where(c =>
@ -159,10 +159,10 @@ namespace SqlSugar
}
classText = this.ClassTemplate;
string ConstructorText = IsDefaultValue ? this.ConstructorTemplate : null;
if (this.Context.MappingTables.IsValuable())
if (this.Context.MappingTables.HasValue())
{
var mappingInfo = this.Context.MappingTables.FirstOrDefault(it => it.DbTableName.Equals(tableInfo.Name, StringComparison.CurrentCultureIgnoreCase));
if (mappingInfo.IsValuable())
if (mappingInfo.HasValue())
{
className = mappingInfo.EntityName;
}
@ -176,7 +176,7 @@ namespace SqlSugar
classText = classText.Replace(DbFirstTemplate.KeyUsing, IsAttribute ? (this.UsingTemplate + "using " + UtilConstants.AssemblyName + ";\r\n") : this.UsingTemplate);
classText = classText.Replace(DbFirstTemplate.KeyClassDescription, this.ClassDescriptionTemplate.Replace(DbFirstTemplate.KeyClassDescription, tableInfo.Description + "\r\n"));
classText = classText.Replace(DbFirstTemplate.KeySugarTable, IsAttribute ? string.Format(DbFirstTemplate.ValueSugarTable, tableInfo.Name) : null);
if (columns.IsValuable())
if (columns.HasValue())
{
foreach (var item in columns)
{
@ -190,9 +190,9 @@ namespace SqlSugar
PropertyDescriptionText = GetPropertyDescriptionText(item, PropertyDescriptionText);
PropertyText = PropertyDescriptionText + PropertyText;
classText = classText.Replace(DbFirstTemplate.KeyPropertyName, PropertyText + (isLast ? "" : ("\r\n" + DbFirstTemplate.KeyPropertyName)));
if (ConstructorText.IsValuable() && item.DefaultValue != null)
if (ConstructorText.HasValue() && item.DefaultValue != null)
{
var hasDefaultValue = columns.Skip(index + 1).Any(it => it.DefaultValue.IsValuable());
var hasDefaultValue = columns.Skip(index + 1).Any(it => it.DefaultValue.HasValue());
ConstructorText = ConstructorText.Replace(DbFirstTemplate.KeyPropertyName, propertyName);
ConstructorText = ConstructorText.Replace(DbFirstTemplate.KeyDefaultValue, GetPropertyTypeConvert(item)) + (!hasDefaultValue ? "" : this.ConstructorTemplate);
}
@ -215,7 +215,7 @@ namespace SqlSugar
classText = classText.Replace(DbFirstTemplate.KeyUsing, IsAttribute ? (this.UsingTemplate + "using " + UtilConstants.AssemblyName + ";\r\n") : this.UsingTemplate);
classText = classText.Replace(DbFirstTemplate.KeyClassDescription, this.ClassDescriptionTemplate.Replace(DbFirstTemplate.KeyClassDescription,"\r\n"));
classText = classText.Replace(DbFirstTemplate.KeySugarTable, IsAttribute ? string.Format(DbFirstTemplate.ValueSugarTable, className) : null);
if (columns.IsValuable())
if (columns.HasValue())
{
foreach (var item in columns)
{
@ -229,9 +229,9 @@ namespace SqlSugar
PropertyDescriptionText = GetPropertyDescriptionText(item, PropertyDescriptionText);
PropertyText = PropertyDescriptionText + PropertyText;
classText = classText.Replace(DbFirstTemplate.KeyPropertyName, PropertyText + (isLast ? "" : ("\r\n" + DbFirstTemplate.KeyPropertyName)));
if (ConstructorText.IsValuable() && item.DefaultValue != null)
if (ConstructorText.HasValue() && item.DefaultValue != null)
{
var hasDefaultValue = columns.Skip(index + 1).Any(it => it.DefaultValue.IsValuable());
var hasDefaultValue = columns.Skip(index + 1).Any(it => it.DefaultValue.HasValue());
ConstructorText = ConstructorText.Replace(DbFirstTemplate.KeyPropertyName, propertyName);
ConstructorText = ConstructorText.Replace(DbFirstTemplate.KeyDefaultValue, GetPropertyTypeConvert(item)) + (!hasDefaultValue ? "" : this.ConstructorTemplate);
}
@ -324,7 +324,7 @@ namespace SqlSugar
}
private string GetPropertyName(DbColumnInfo item)
{
if (this.Context.MappingColumns.IsValuable())
if (this.Context.MappingColumns.HasValue())
{
var mappingInfo = this.Context.MappingColumns.SingleOrDefault(it => it.DbColumnName == item.DbColumnName && it.EntityName == GetEnityName(item));
return mappingInfo == null ? item.DbColumnName : mappingInfo.PropertyName;

2
Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@ -23,7 +23,7 @@ namespace SqlSugar
{
EntityInfo result = new EntityInfo();
var sugarAttributeInfo = type.GetTypeInfo().GetCustomAttributes(typeof(SugarTable), true).Where(it => it is SugarTable).SingleOrDefault();
if (sugarAttributeInfo.IsValuable())
if (sugarAttributeInfo.HasValue())
{
var sugarTable = (SugarTable)sugarAttributeInfo;
result.DbTableName = sugarTable.TableName;

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

@ -117,7 +117,7 @@ namespace SqlSugar
}
public virtual ISugarQueryable<T> Where(string whereString, object whereObj = null)
{
if (whereString.IsValuable())
if (whereString.HasValue())
this.Where<T>(whereString, whereObj);
return this;
}
@ -389,7 +389,7 @@ namespace SqlSugar
QueryBuilder.Skip = 0;
QueryBuilder.Take = 1;
var reval = this.ToList();
if (reval.IsValuable())
if (reval.HasValue())
{
return reval.FirstOrDefault();
}
@ -438,7 +438,7 @@ namespace SqlSugar
public virtual ISugarQueryable<T> MergeTable()
{
Check.Exception(this.QueryBuilder.SelectValue.IsNullOrEmpty(), "MergeTable need to use Select(it=>new{}) Method .");
Check.Exception(this.QueryBuilder.Skip > 0 || this.QueryBuilder.Take > 0 || this.QueryBuilder.OrderByValue.IsValuable(), "MergeTable Queryable cannot Take Skip OrderBy PageToList ");
Check.Exception(this.QueryBuilder.Skip > 0 || this.QueryBuilder.Take > 0 || this.QueryBuilder.OrderByValue.HasValue(), "MergeTable Queryable cannot Take Skip OrderBy PageToList ");
var sql = QueryBuilder.ToSqlString();
var tableName = this.SqlBuilder.GetPackTable(sql, "MergeTable");
var mergeQueryable = this.Context.Queryable<ExpandoObject>();
@ -536,7 +536,7 @@ namespace SqlSugar
{
if (pageIndex == 0)
pageIndex = 1;
if (QueryBuilder.PartitionByValue.IsValuable())
if (QueryBuilder.PartitionByValue.HasValue())
{
QueryBuilder.ExternalPageIndex = pageIndex;
QueryBuilder.ExternalPageSize = pageSize;
@ -566,7 +566,7 @@ namespace SqlSugar
{
if (pageIndex == 0)
pageIndex = 1;
if (QueryBuilder.PartitionByValue.IsValuable())
if (QueryBuilder.PartitionByValue.HasValue())
{
QueryBuilder.ExternalPageIndex = pageIndex;
QueryBuilder.ExternalPageSize = pageSize;
@ -989,7 +989,7 @@ namespace SqlSugar
protected void _Filter(string FilterName, bool isDisabledGobalFilter)
{
QueryBuilder.IsDisabledGobalFilter = isDisabledGobalFilter;
if (this.Context.QueryFilter.GeFilterList.IsValuable() && FilterName.IsValuable())
if (this.Context.QueryFilter.GeFilterList.HasValue() && FilterName.HasValue())
{
var list = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName == FilterName && it.IsJoinQuery == !QueryBuilder.IsSingle());
foreach (var item in list)
@ -1068,7 +1068,7 @@ namespace SqlSugar
protected void _InQueryable(Expression<Func<T, object>> expression, KeyValuePair<string, List<SugarParameter>> sqlObj)
{
string sql = sqlObj.Key;
if (sqlObj.Value.IsValuable())
if (sqlObj.Value.HasValue())
{
this.SqlBuilder.RepairReplicationParameters(ref sql, sqlObj.Value.ToArray(), 100);
this.QueryBuilder.Parameters.AddRange(sqlObj.Value);
@ -1119,9 +1119,9 @@ namespace SqlSugar
private void SetContextModel<TResult>(List<TResult> result, Type entityType)
{
if (result.IsValuable())
if (result.HasValue())
{
if (entityType.GetTypeInfo().BaseType.IsValuable() && entityType.GetTypeInfo().BaseType == UtilConstants.ModelType)
if (entityType.GetTypeInfo().BaseType.HasValue() && entityType.GetTypeInfo().BaseType == UtilConstants.ModelType)
{
foreach (var item in result)
{

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

@ -84,7 +84,7 @@ namespace SqlSugar
{
var result = Builder.GetTranslationTableName(EntityInfo.EntityName);
result += UtilConstants.Space;
if (this.TableWithString.IsValuable())
if (this.TableWithString.HasValue())
{
result += TableWithString + UtilConstants.Space;
}

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

@ -88,7 +88,7 @@ namespace SqlSugar
{
var result = Builder.GetTranslationTableName(EntityInfo.EntityName);
result += UtilConstants.Space;
if (this.TableWithString.IsValuable())
if (this.TableWithString.HasValue())
{
result += TableWithString + UtilConstants.Space;
}

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

@ -226,7 +226,7 @@ namespace SqlSugar
resolveExpress.Resolve(expression, resolveType);
this.Parameters.AddRange(resolveExpress.Parameters);
var reval = resolveExpress.Result;
var isSingleTableHasSubquery = IsSingle() && resolveExpress.SingleTableNameSubqueryShortName.IsValuable();
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;
@ -241,14 +241,14 @@ namespace SqlSugar
AppendFilter();
sql = new StringBuilder();
if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY GetDate() ";
if (this.PartitionByValue.IsValuable())
if (this.PartitionByValue.HasValue())
{
this.OrderByValue = this.PartitionByValue + this.OrderByValue;
}
var isRowNumber = Skip != null || Take != null;
var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString);
string groupByValue = GetGroupByString + HavingInfos;
string orderByValue = (!isRowNumber && this.OrderByValue.IsValuable()) ? GetOrderByString : null;
string orderByValue = (!isRowNumber && this.OrderByValue.HasValue()) ? GetOrderByString : null;
if (isIgnoreOrderBy) { orderByValue = null; }
sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, groupByValue, orderByValue);
sql.Replace(UtilConstants.ReplaceKey, isRowNumber ? (isIgnoreOrderBy ? null : rowNumberString) : null);
@ -269,7 +269,7 @@ namespace SqlSugar
public virtual void AppendFilter()
{
if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.IsValuable())
if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.HasValue())
{
var gobalFilterList = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList();
foreach (var item in gobalFilterList.Where(it => it.IsJoinQuery == !IsSingle()))
@ -277,7 +277,7 @@ namespace SqlSugar
var filterResult = item.FilterValue(this.Context);
WhereInfos.Add(this.Builder.AppendWhereOrAnd(this.WhereInfos.IsNullOrEmpty(), filterResult.Sql));
var filterParamters = this.Context.Ado.GetParameters(filterResult.Parameters);
if (filterParamters.IsValuable())
if (filterParamters.HasValue())
{
this.Parameters.AddRange(filterParamters);
}
@ -384,7 +384,7 @@ namespace SqlSugar
if (this.SelectValue.IsNullOrEmpty())
{
string pre = null;
if (this.JoinQueryInfos.IsValuable() && this.JoinQueryInfos.Any(it => TableShortName.IsValuable()))
if (this.JoinQueryInfos.HasValue() && this.JoinQueryInfos.Any(it => TableShortName.HasValue()))
{
pre = Builder.GetTranslationColumnName(TableShortName) + ".";
}
@ -426,11 +426,11 @@ namespace SqlSugar
{
var result = Builder.GetTranslationTableName(EntityName);
result += UtilConstants.Space;
if (this.TableShortName.IsValuable())
if (this.TableShortName.HasValue())
{
result += (TableShortName + UtilConstants.Space);
}
if (this.TableWithString.IsValuable())
if (this.TableWithString.HasValue())
{
result += TableWithString + UtilConstants.Space;
}
@ -441,7 +441,7 @@ namespace SqlSugar
if (this.EasyJoinInfos.IsValuable())
{
if (this.TableWithString.IsValuable())
if (this.TableWithString.HasValue())
{
result += "," + string.Join(",", this.EasyJoinInfos.Select(it => string.Format("{0} {1} {2} ", GetTableName(it.Value), it.Key, TableWithString)));
}

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

@ -93,7 +93,7 @@ namespace SqlSugar
{
var result = Builder.GetTranslationTableName(TableName);
result += UtilConstants.Space;
if (this.TableWithString.IsValuable())
if (this.TableWithString.HasValue())
{
result += TableWithString + UtilConstants.Space;
}
@ -181,7 +181,7 @@ namespace SqlSugar
pageIndex++;
updateTable.Append("\r\n");
string whereString = null;
if (this.WhereValues.IsValuable())
if (this.WhereValues.HasValue())
{
foreach (var item in WhereValues)
{
@ -190,7 +190,7 @@ namespace SqlSugar
whereString += item;
}
}
else if (PrimaryKeys.IsValuable())
else if (PrimaryKeys.HasValue())
{
foreach (var item in PrimaryKeys)
{
@ -220,7 +220,7 @@ namespace SqlSugar
return result;
}));
string whereString = null;
if (this.WhereValues.IsValuable())
if (this.WhereValues.HasValue())
{
foreach (var item in WhereValues)
{
@ -229,7 +229,7 @@ namespace SqlSugar
whereString += item;
}
}
else if (PrimaryKeys.IsValuable())
else if (PrimaryKeys.HasValue())
{
foreach (var item in PrimaryKeys)
{

6
Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs
View File

@ -148,7 +148,7 @@ namespace SqlSugar
var expResult = UpdateBuilder.GetExpressionValue(columns, ResolveExpressType.Update);
var resultArray = expResult.GetResultArray();
Check.ArgumentNullException(resultArray, "UpdateColumns Parameter error, UpdateColumns(it=>new T{ it.id=1}) is valid, UpdateColumns(it=>T) is error");
if (resultArray.IsValuable())
if (resultArray.HasValue())
{
foreach (var item in resultArray)
{
@ -268,7 +268,7 @@ namespace SqlSugar
}
});
}
if (this.UpdateBuilder.Parameters.IsValuable() && this.UpdateBuilder.SetValues.IsValuable())
if (this.UpdateBuilder.Parameters.HasValue() && this.UpdateBuilder.SetValues.IsValuable())
{
this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName));
}
@ -295,7 +295,7 @@ namespace SqlSugar
}
private List<string> GetPrimaryKeys()
{
if (this.WhereColumnList.IsValuable())
if (this.WhereColumnList.HasValue())
{
return this.WhereColumnList;
}

16
Src/Asp.Net/SqlSugar/CacheScheme/CacheEngines.cs
View File

@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace SqlSugar
{
internal class CacheEngines
{
static string CacheMappingKey = "SqlSugarDataCacheMapping";
public static string GetCacheMapping(string tableName)
{
return CacheMappingKey+ UtilConstants.Dot+tableName+ UtilConstants.Dot + Guid.NewGuid();
}
}
}

29
Src/Asp.Net/SqlSugar/CacheScheme/CacheSchemeMain.cs
View File

@ -11,26 +11,23 @@ namespace SqlSugar
{
CacheKey key = CacheKeyBuider.GetKey(context, queryBuilder);
string keyString = key.ToString();
foreach (var tableName in key.Tables)
{
//if (!mappingInfo.Any(it=>it.Key.Equals(tableName,StringComparison.CurrentCultureIgnoreCase))) {
// cacheService.Add<>(new KeyValuePair<string,string>(tableName, keyString));
//}
}
T result = default(T);
//if (mappingKey.IsNullOrEmpty())
// result = getData();
//else
//{
// result = cacheService.GetOrCreate("", () => getData(), cacheDurationInSeconds);
//}
var result = cacheService.GetOrCreate(keyString, getData, cacheDurationInSeconds);
return result;
}
public static void RemoveCache(string tableName)
public static void RemoveCache(ICacheService cacheService, string tableName)
{
var keys = cacheService.GetAllKey<string>();
if (keys.HasValue())
{
foreach (var item in keys)
{
if (keys.Contains(UtilConstants.Dot + tableName + UtilConstants.Dot))
{
cacheService.Remove<string>(item);
}
}
}
}
}
}

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/ExpressionParameter.cs
View File

@ -40,7 +40,7 @@ namespace SqlSugar
{
get
{
return BaseParameter.CommonTempData.IsValuable() && BaseParameter.CommonTempData.Equals(CommonTempDataType.Result);
return BaseParameter.CommonTempData.HasValue() && BaseParameter.CommonTempData.Equals(CommonTempDataType.Result);
}
}
}

4
Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/ExpressionResult.cs
View File

@ -110,7 +110,7 @@ namespace SqlSugar
public void Append(object parameter)
{
if (this.CurrentParameter.IsValuable() && this.CurrentParameter.AppendType.IsIn(ExpressionResultAppendType.AppendTempDate))
if (this.CurrentParameter.HasValue() && this.CurrentParameter.AppendType.IsIn(ExpressionResultAppendType.AppendTempDate))
{
this.CurrentParameter.CommonTempData = parameter;
return;
@ -140,7 +140,7 @@ namespace SqlSugar
public void AppendFormat(string parameter, params object[] orgs)
{
if (this.CurrentParameter.IsValuable() && this.CurrentParameter.AppendType.IsIn(ExpressionResultAppendType.AppendTempDate))
if (this.CurrentParameter.HasValue() && this.CurrentParameter.AppendType.IsIn(ExpressionResultAppendType.AppendTempDate))
{
this.CurrentParameter.CommonTempData = new KeyValuePair<string, object[]>(parameter, orgs);
return;

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/SqlFunc.cs
View File

@ -15,7 +15,7 @@ namespace SqlSugar
}
public static bool HasValue(object thisValue)
{
return thisValue.IsValuable();
return thisValue.HasValue();
}
public static bool IsNullOrEmpty(object thisValue)
{

4
Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
View File

@ -130,7 +130,7 @@ namespace SqlSugar
{
Check.ArgumentNullException(entityName, string.Format(ErrorMessage.ObjNotExist, "Table Name"));
if (IsTranslationText(entityName)) return entityName;
isMapping = isMapping && this.MappingTables.IsValuable();
isMapping = isMapping && this.MappingTables.HasValue();
var isComplex = entityName.Contains(UtilConstants.Dot);
if (isMapping && isComplex)
{
@ -175,7 +175,7 @@ namespace SqlSugar
}
public virtual string GetDbColumnName(string entityName, string propertyName)
{
if (this.MappingColumns.IsValuable())
if (this.MappingColumns.HasValue())
{
var mappingInfo = this.MappingColumns.SingleOrDefault(it => it.EntityName == entityName && it.PropertyName == propertyName);
return mappingInfo == null ? propertyName : mappingInfo.DbColumnName;

6
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
View File

@ -259,7 +259,7 @@ namespace SqlSugar
newContext.Resolve(item, this.Context.IsJoin ? ResolveExpressType.WhereMultiple : ResolveExpressType.WhereSingle);
this.Context.Index = newContext.Index;
this.Context.ParameterIndex = newContext.ParameterIndex;
if (newContext.Parameters.IsValuable())
if (newContext.Parameters.HasValue())
{
this.Context.Parameters.AddRange(newContext.Parameters);
}
@ -277,7 +277,7 @@ namespace SqlSugar
newContext.Resolve(item, this.Context.IsJoin ? ResolveExpressType.WhereMultiple : ResolveExpressType.WhereSingle);
this.Context.Index = newContext.Index;
this.Context.ParameterIndex = newContext.ParameterIndex;
if (newContext.Parameters.IsValuable())
if (newContext.Parameters.HasValue())
{
this.Context.Parameters.AddRange(newContext.Parameters);
}
@ -383,7 +383,7 @@ namespace SqlSugar
newContext.Resolve(item, resolveExpressType);
this.Context.Index = newContext.Index;
this.Context.ParameterIndex = newContext.ParameterIndex;
if (newContext.Parameters.IsValuable())
if (newContext.Parameters.HasValue())
{
this.Context.Parameters.AddRange(newContext.Parameters);
}

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
View File

@ -15,7 +15,7 @@ namespace SqlSugar
object value = ExpressionTool.GetValue(expression.Value);
var baseParameter = parameter.BaseParameter;
baseParameter.ChildExpression = expression;
var isSetTempData = baseParameter.CommonTempData.IsValuable() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
var isSetTempData = baseParameter.CommonTempData.HasValue() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
switch (parameter.Context.ResolveType)
{
case ResolveExpressType.SelectSingle:

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberConstExpressionResolve.cs
View File

@ -15,7 +15,7 @@ namespace SqlSugar
var isLeft = parameter.IsLeft;
object value = ExpressionTool.GetMemberValue(expression.Member, expression);
var baseParameter = parameter.BaseParameter;
var isSetTempData = baseParameter.CommonTempData.IsValuable() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
var isSetTempData = baseParameter.CommonTempData.HasValue() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
switch (parameter.Context.ResolveType)
{
case ResolveExpressType.Update:

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberNoExpressionResolve.cs
View File

@ -16,7 +16,7 @@ namespace SqlSugar
var isField = expression.Member is System.Reflection.FieldInfo;
var isProperty = expression.Member is System.Reflection.PropertyInfo;
var baseParameter = parameter.BaseParameter;
var isSetTempData = baseParameter.CommonTempData.IsValuable() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
var isSetTempData = baseParameter.CommonTempData.HasValue() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
if (isField)
{
value = ExpressionTool.GetFiledValue(expression);

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubTools.cs
View File

@ -39,7 +39,7 @@ namespace SqlSugar
newContext.Resolve(item, type);
context.Index = newContext.Index;
context.ParameterIndex = newContext.ParameterIndex;
if (newContext.Parameters.IsValuable())
if (newContext.Parameters.HasValue())
context.Parameters.AddRange(newContext.Parameters);
return newContext.Result.GetResultString();
}

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

@ -116,7 +116,7 @@ namespace SqlSugar
this.IgnoreColumns = new IgnoreColumnList();
if (!this.MappingTables.Any(it => it.EntityName == entityInfo.EntityName))
{
if (entityInfo.DbTableName != entityInfo.EntityName && entityInfo.DbTableName.IsValuable())
if (entityInfo.DbTableName != entityInfo.EntityName && entityInfo.DbTableName.HasValue())
{
this.MappingTables.Add(entityInfo.EntityName, entityInfo.DbTableName);
}
@ -127,7 +127,7 @@ namespace SqlSugar
foreach (var item in entityInfo.Columns.Where(it => it.IsIgnore == false))
{
if (!mappingColumnInfos.Any(it => it.PropertyName == item.PropertyName))
if (item.PropertyName != item.DbColumnName && item.DbColumnName.IsValuable())
if (item.PropertyName != item.DbColumnName && item.DbColumnName.HasValue())
this.MappingColumns.Add(item.PropertyName, item.DbColumnName, item.EntityName);
}
var ignoreInfos = this.IgnoreColumns.Where(it => it.EntityName == entityInfo.EntityName);
@ -238,7 +238,7 @@ namespace SqlSugar
{
var isFirst = i == 0; ++i;
JoinQueryInfo joinInfo = new JoinQueryInfo();
var hasMappingTable = expressionContext.MappingTables.IsValuable();
var hasMappingTable = expressionContext.MappingTables.HasValue();
MappingTable mappingInfo = null;
if (hasMappingTable)
{

4
Src/Asp.Net/SqlSugar/Realization/MySql/CodeFirst/MySqlCodeFirst.cs
View File

@ -12,7 +12,7 @@ namespace SqlSugar
var tableName = GetTableName(entityInfo);
Check.Exception(entityInfo.Columns.Where(it => it.IsPrimarykey).Count() > 1, "Use Code First ,The primary key must not exceed 1");
List<DbColumnInfo> columns = new List<DbColumnInfo>();
if (entityInfo.Columns.IsValuable())
if (entityInfo.Columns.HasValue())
{
foreach (var item in entityInfo.Columns)
{
@ -28,7 +28,7 @@ namespace SqlSugar
{
DataType = this.Context.Ado.DbBind.GetDbTypeName(UtilMethods.GetUnderType(item.PropertyInfo).Name),
TableId = entityInfo.Columns.IndexOf(item),
DbColumnName = item.DbColumnName.IsValuable() ? item.DbColumnName : item.PropertyName,
DbColumnName = item.DbColumnName.HasValue() ? item.DbColumnName : item.PropertyName,
IsPrimarykey = item.IsPrimarykey,
IsIdentity = item.IsIdentity,
TableName = tableName,

2
Src/Asp.Net/SqlSugar/Realization/MySql/DbBind/MySqlDbBind.cs
View File

@ -21,7 +21,7 @@ namespace SqlSugar
if (csharpTypeName == "Boolean")
csharpTypeName = "bool";
var mappings = this.MappingTypes.Where(it => it.Value.ToString().Equals(csharpTypeName, StringComparison.CurrentCultureIgnoreCase));
return mappings.IsValuable() ? mappings.First().Key : "varchar";
return mappings.HasValue() ? mappings.First().Key : "varchar";
}
public override List<KeyValuePair<string, CSharpDataType>> MappingTypes
{

2
Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs
View File

@ -181,7 +181,7 @@ namespace SqlSugar
#region Methods
public override bool CreateTable(string tableName, List<DbColumnInfo> columns)
{
if (columns.IsValuable())
if (columns.HasValue())
{
foreach (var item in columns)
{

2
Src/Asp.Net/SqlSugar/Realization/MySql/MySqlProvider.cs
View File

@ -65,7 +65,7 @@ namespace SqlSugar
{
sqlCommand.Transaction = (MySqlTransaction)this.Transaction;
}
if (parameters.IsValuable())
if (parameters.HasValue())
{
IDataParameter[] ipars = ToIDbDataParameter(parameters);
sqlCommand.Parameters.AddRange((MySqlParameter[])ipars);

4
Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs
View File

@ -63,7 +63,7 @@ namespace SqlSugar
pageIndex++;
updateTable.Append("\r\n");
string whereString = null;
if (this.WhereValues.IsValuable())
if (this.WhereValues.HasValue())
{
foreach (var item in WhereValues)
{
@ -72,7 +72,7 @@ namespace SqlSugar
whereString += item;
}
}
else if (PrimaryKeys.IsValuable())
else if (PrimaryKeys.HasValue())
{
foreach (var item in PrimaryKeys)
{

2
Src/Asp.Net/SqlSugar/Realization/Oracle/Deleteable/OracleDeleteable.cs
View File

@ -9,7 +9,7 @@ namespace SqlSugar
{
protected override List<string> GetIdentityKeys()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.DbColumnName).ToList();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.DbColumnName).ToList();
}
}
}

8
Src/Asp.Net/SqlSugar/Realization/Oracle/Insertable/OracleInsertable.cs
View File

@ -9,15 +9,15 @@ namespace SqlSugar
{
protected override List<string> GetIdentityKeys()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.DbColumnName).ToList();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.DbColumnName).ToList();
}
protected string GetSeqName()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.OracleSequenceName).First();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.OracleSequenceName).First();
}
protected List<string> GetSeqNames()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.OracleSequenceName).ToList();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.OracleSequenceName).ToList();
}
public override int ExecuteReturnIdentity()
{
@ -40,7 +40,7 @@ namespace SqlSugar
var identities = GetSeqNames();
var insertCount = InsertObjs.Count();
InsertBuilder.OracleSeqInfoList = new Dictionary<string, int>();
if (identities.IsValuable()&& insertCount > 1)
if (identities.HasValue()&& insertCount > 1)
{
Check.Exception(identities.Count != identities.Distinct().Count(), "The field sequence needs to be unique");
foreach (var seqName in identities)

2
Src/Asp.Net/SqlSugar/Realization/Oracle/OracleProvider.cs
View File

@ -72,7 +72,7 @@ namespace SqlSugar
{
sqlCommand.Transaction = (OracleTransaction)this.Transaction;
}
if (parameters.IsValuable())
if (parameters.HasValue())
{
IDataParameter[] ipars = ToIDbDataParameter(parameters);
sqlCommand.Parameters.AddRange((OracleParameter[])ipars);

2
Src/Asp.Net/SqlSugar/Realization/Oracle/Queryable/OracleQueryable.cs
View File

@ -15,7 +15,7 @@ namespace SqlSugar
}
protected override List<string> GetIdentityKeys()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.DbColumnName).ToList();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.DbColumnName).ToList();
}
}
public class OracleQueryable<T, T2> : QueryableProvider<T, T2>

8
Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleInsertBuilder.cs
View File

@ -28,7 +28,7 @@ namespace SqlSugar
}
public override string ToSqlString()
{
var identities = this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).ToList();
var identities = this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).ToList();
if (IsNoInsertNull)
{
DbColumnInfoList = DbColumnInfoList.Where(it => it.Value != null).ToList();
@ -39,7 +39,7 @@ namespace SqlSugar
if (isSingle)
{
string columnParametersString = string.Join(",", this.DbColumnInfoList.Select(it => Builder.SqlParameterKeyWord + it.DbColumnName));
if (identities.IsValuable())
if (identities.HasValue())
{
columnsString = columnsString.TrimEnd(',') + "," + string.Join(",", identities.Select(it => Builder.GetTranslationColumnName(it.DbColumnName)));
columnParametersString = columnParametersString.TrimEnd(',') + "," + string.Join(",", identities.Select(it => it.OracleSequenceName + ".nextval"));
@ -53,7 +53,7 @@ namespace SqlSugar
int pageIndex = 1;
int totalRecord = groupList.Count;
int pageCount = (totalRecord + pageSize - 1) / pageSize;
if (identities.IsValuable())
if (identities.HasValue())
{
columnsString = columnsString.TrimEnd(',') + "," + string.Join(",", identities.Select(it => Builder.GetTranslationColumnName(it.DbColumnName)));
}
@ -69,7 +69,7 @@ namespace SqlSugar
batchInsetrSql.Append(SqlTemplateBatchUnion);
}
var insertColumns = string.Join(",", columns.Select(it => string.Format(SqlTemplateBatchSelect, FormatValue(it.Value), Builder.GetTranslationColumnName(it.DbColumnName))));
if (identities.IsValuable())
if (identities.HasValue())
{
insertColumns = insertColumns.TrimEnd(',') + "," + string.Join(",", identities.Select(it =>
{

4
Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs
View File

@ -28,14 +28,14 @@ namespace SqlSugar
AppendFilter();
sql = new StringBuilder();
if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY "+ this.Builder.SqlDateNow + " ";
if (this.PartitionByValue.IsValuable())
if (this.PartitionByValue.HasValue())
{
this.OrderByValue = this.PartitionByValue + this.OrderByValue;
}
var isRowNumber = Skip != null || Take != null;
var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString);
string groupByValue = GetGroupByString + HavingInfos;
string orderByValue = (!isRowNumber && this.OrderByValue.IsValuable()) ? GetOrderByString : null;
string orderByValue = (!isRowNumber && this.OrderByValue.HasValue()) ? GetOrderByString : null;
if (isIgnoreOrderBy) { orderByValue = null; }
sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, groupByValue, orderByValue);
sql.Replace(UtilConstants.ReplaceKey, isRowNumber ? (isIgnoreOrderBy ? null : rowNumberString) : null);

2
Src/Asp.Net/SqlSugar/Realization/Oracle/Updateable/OracleUpdateable.cs
View File

@ -9,7 +9,7 @@ namespace SqlSugar
{
protected override List<string> GetIdentityKeys()
{
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.IsValuable()).Select(it => it.DbColumnName).ToList();
return this.EntityInfo.Columns.Where(it => it.OracleSequenceName.HasValue()).Select(it => it.DbColumnName).ToList();
}
}
}

2
Src/Asp.Net/SqlSugar/Realization/SqlServer/SqlServerProvider.cs
View File

@ -64,7 +64,7 @@ namespace SqlSugar
{
sqlCommand.Transaction = (SqlTransaction)this.Transaction;
}
if (parameters.IsValuable())
if (parameters.HasValue())
{
IDataParameter[] ipars = ToIDbDataParameter(parameters);
sqlCommand.Parameters.AddRange((SqlParameter[])ipars);

6
Src/Asp.Net/SqlSugar/Realization/Sqlite/CodeFirst/SqliteCodeFirst.cs
View File

@ -13,7 +13,7 @@ namespace SqlSugar
string backupName = tableName + DateTime.Now.ToString("yyyyMMddHHmmss");
Check.Exception(entityInfo.Columns.Where(it => it.IsPrimarykey).Count() > 1, "Use Code First ,The primary key must not exceed 1");
List<DbColumnInfo> columns = new List<DbColumnInfo>();
if (entityInfo.Columns.IsValuable())
if (entityInfo.Columns.HasValue())
{
foreach (var item in entityInfo.Columns.Where(it => it.IsIgnore == false))
{
@ -31,7 +31,7 @@ namespace SqlSugar
string backupName=tableName+DateTime.Now.ToString("yyyyMMddHHmmss");
Check.Exception(entityInfo.Columns.Where(it => it.IsPrimarykey).Count() > 1, "Use Code First ,The primary key must not exceed 1");
List<DbColumnInfo> columns = new List<DbColumnInfo>();
if (entityInfo.Columns.IsValuable())
if (entityInfo.Columns.HasValue())
{
foreach (var item in entityInfo.Columns.Where(it=>it.IsIgnore==false))
{
@ -47,7 +47,7 @@ namespace SqlSugar
{
DataType = this.Context.Ado.DbBind.GetDbTypeName(UtilMethods.GetUnderType(item.PropertyInfo).Name),
TableId = entityInfo.Columns.IndexOf(item),
DbColumnName = item.DbColumnName.IsValuable() ? item.DbColumnName : item.PropertyName,
DbColumnName = item.DbColumnName.HasValue() ? item.DbColumnName : item.PropertyName,
IsPrimarykey = item.IsPrimarykey,
IsIdentity = item.IsIdentity,
TableName = tableName,

2
Src/Asp.Net/SqlSugar/Realization/Sqlite/DbBind/SqliteDbBind.cs
View File

@ -21,7 +21,7 @@ namespace SqlSugar
if (csharpTypeName == "Boolean")
csharpTypeName = "bool";
var mappings = this.MappingTypes.Where(it => it.Value.ToString().Equals(csharpTypeName, StringComparison.CurrentCultureIgnoreCase));
return mappings.IsValuable() ? mappings.First().Key : "varchar";
return mappings.HasValue() ? mappings.First().Key : "varchar";
}
public override List<KeyValuePair<string, CSharpDataType>> MappingTypes
{

2
Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs
View File

@ -203,7 +203,7 @@ namespace SqlSugar
public override bool CreateTable(string tableName, List<DbColumnInfo> columns)
{
if (columns.IsValuable())
if (columns.HasValue())
{
foreach (var item in columns)
{

2
Src/Asp.Net/SqlSugar/Realization/Sqlite/SqliteProvider.cs
View File

@ -61,7 +61,7 @@ namespace SqlSugar
{
sqlCommand.Transaction = (SQLiteTransaction)this.Transaction;
}
if (parameters.IsValuable())
if (parameters.HasValue())
{
IDataParameter[] ipars = ToIDbDataParameter(parameters);
sqlCommand.Parameters.AddRange((SQLiteParameter[])ipars);

1
Src/Asp.Net/SqlSugar/SqlSugar.csproj
View File

@ -72,7 +72,6 @@
<Compile Include="Abstract\FilterProvider\FilterProvider.cs" />
<Compile Include="Abstract\InsertableProvider\InsertableProvider.cs" />
<Compile Include="Abstract\DeleteProvider\DeleteableProvider.cs" />
<Compile Include="CacheScheme\CacheEngines.cs" />
<Compile Include="CacheScheme\CacheKeyBuider.cs" />
<Compile Include="CacheScheme\CacheSchemeMain.cs" />
<Compile Include="Entities\CacheKey.cs" />

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

@ -322,7 +322,7 @@ namespace SqlSugar
var sqlObj = item.ToSql();
string sql = sqlObj.Key;
UtilMethods.RepairReplicationParameters(ref sql, sqlObj.Value.ToArray(), i);
if (sqlObj.Value.IsValuable())
if (sqlObj.Value.HasValue())
allItems.Add(new KeyValuePair<string, List<SugarParameter>>(sql, sqlObj.Value));
else
allItems.Add(new KeyValuePair<string, List<SugarParameter>>(sql, new List<SugarParameter>()));

2
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@ -59,7 +59,7 @@ namespace SqlSugar
internal static void RepairReplicationParameters(ref string appendSql, SugarParameter[] parameters, int addIndex)
{
if (appendSql.IsValuable() && parameters.IsValuable())
if (appendSql.HasValue() && parameters.HasValue())
{
foreach (var parameter in parameters.OrderByDescending(it => it.ParameterName.Length))
{

4
Src/Asp.Net/SqlSugar/Utilities/ValidateExtensions.cs
View File

@ -51,13 +51,13 @@ namespace SqlSugar
return false;
}
public static bool IsValuable(this object thisValue)
public static bool HasValue(this object thisValue)
{
if (thisValue == null || thisValue == DBNull.Value) return false;
return thisValue.ToString() != "";
}
public static bool IsValuable(this IEnumerable<object> thisValue)
public static bool HasValue(this IEnumerable<object> thisValue)
{
if (thisValue == null || thisValue.Count() == 0) return false;
return true;