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

Update .net core project

Browse Source
This commit is contained in:
sunkaixuan 2022-07-10 14:20:20 +08:00
parent e3e4026e91
commit 81fceb8247
6 changed files with 73 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@ -265,6 +265,17 @@ namespace SqlSugar
}
}
}
else
{
foreach (var listItem in list)
{
if (navObjectNamePropety.GetValue(listItem) == null)
{
var newinstance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true) as IList;
navObjectNamePropety.SetValue(listItem,newinstance);
}
}
}
}
private static void SkipTakeIList(SqlInfo sql, IList instanceCast, IList newinstance)

6
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -1143,7 +1143,8 @@ namespace SqlSugar
this.QueryBuilder.OrderByValue == null &&
this.QueryBuilder.PartitionByValue == null&&
this.QueryBuilder.SelectValue==null&&
this.QueryBuilder.Includes == null)
this.QueryBuilder.Includes == null&&
this.QueryBuilder.IsDistinct==false)
{
return this.Clone().Select<int>(" COUNT(1) ").ToList().First();
@ -2154,7 +2155,8 @@ namespace SqlSugar
this.QueryBuilder.OrderByValue == null &&
this.QueryBuilder.PartitionByValue == null &&
this.QueryBuilder.SelectValue == null &&
this.QueryBuilder.Includes == null)
this.QueryBuilder.Includes == null&&
this.QueryBuilder.IsDistinct==false)
{
var list = await this.Clone().Select<int>(" COUNT(1) ").ToListAsync();
return list.First();

2
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/UnaryExpressionResolve.cs
View File

@ -121,6 +121,8 @@ namespace SqlSugar
AppendNot(parameter.CommonTempData);
base.Start();
parameter.BaseParameter.CommonTempData = parameter.CommonTempData;
if (nodeType == ExpressionType.Negate&& parameter.BaseParameter.CommonTempData is int)
parameter.BaseParameter.CommonTempData =Convert.ToInt32(parameter.BaseParameter.CommonTempData)*-1;
parameter.BaseParameter.ChildExpression = base.Expression;
parameter.CommonTempData = null;
}

30
Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs
View File

@ -44,12 +44,11 @@ namespace SqlSugar
var type = UtilMethods.GetUnderType(value.GetType());
if (type == UtilConstants.DateType)
{
var date = value.ObjToDate();
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
return GetDateTimeString(value);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
else if (value is DateTimeOffset)
{
return GetDateTimeOffsetString(value);
}
else if (type == UtilConstants.ByteArrayType)
{
@ -84,6 +83,27 @@ namespace SqlSugar
}
}
}
private object GetDateTimeOffsetString(object value)
{
var date = UtilMethods.ConvertFromDateTimeOffset((DateTimeOffset)value);
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
}
private object GetDateTimeString(object value)
{
var date = value.ObjToDate();
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
}
private string GetString(object value)
{
var result = value.ToString();

30
Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs
View File

@ -106,12 +106,11 @@ namespace SqlSugar
var type = UtilMethods.GetUnderType(value.GetType());
if (type == UtilConstants.DateType)
{
var date = value.ObjToDate();
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
return GetDateTimeString(value);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
else if (value is DateTimeOffset)
{
return GetDateTimeOffsetString(value);
}
else if (type == UtilConstants.ByteArrayType)
{
@ -154,6 +153,27 @@ namespace SqlSugar
}
}
}
private object GetDateTimeString(object value)
{
var date = value.ObjToDate();
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
}
private object GetDateTimeOffsetString(object value)
{
var date = UtilMethods.ConvertFromDateTimeOffset((DateTimeOffset)value);
if (date < UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig))
{
date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig);
}
return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'";
}
private string GetString(object value)
{
var result = value.ToString();

4
Src/Asp.NetCore2/SqlSugar/Realization/Oracle/OracleProvider.cs
View File

@ -25,6 +25,10 @@ namespace SqlSugar
{
break;
}
else if (item.Value != null &&Regex.IsMatch(item.Value.Trim(), @"^\w+\,\@\w+\,$"))
{
break;
}
sql = sql.Replace(item.Value, item.Value.Replace("@", UtilConstants.ReplaceKey));
}
}