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

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2025-03-17 19:55:05 +08:00
parent 30c5be494b
commit f1733039d2
10 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ namespace SqlSugar
{
value = columnInfo.DefaultValue;
}
else if (columnInfo.DataType.ObjToString().ToLower().IsIn("int","int4","bigint","int8","int2")&& columnInfo.DefaultValue.IsInt())
else if (columnInfo.DataType.ObjToString().ToLower().IsIn("float","double","decimal","int","int4","bigint","int8","int2")&& columnInfo.DefaultValue.IsInt())
{
value = columnInfo.DefaultValue;
}

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

@ -211,19 +211,23 @@ namespace SqlSugar
}
public ISugarQueryable<T, T2> LeftJoinIF<T2>(bool isLeftJoin, Expression<Func<T, T2, bool>> joinExpression)
{
var oldAsName = this.QueryBuilder.AsTables?.ToDictionary(it=>it.Key,it=>it.Value);
var result = LeftJoin(joinExpression);
if (isLeftJoin == false)
{
result.QueryBuilder.JoinQueryInfos.Remove(result.QueryBuilder.JoinQueryInfos.Last());
result.QueryBuilder.AsTables = oldAsName;
}
return result;
}
public ISugarQueryable<T, T2> InnerJoinIF<T2>(bool isJoin, Expression<Func<T, T2, bool>> joinExpression)
{
var oldAsName = this.QueryBuilder.AsTables?.ToDictionary(it => it.Key, it => it.Value);
var result = InnerJoin(joinExpression);
if (isJoin == false)
{
result.QueryBuilder.JoinQueryInfos.Remove(result.QueryBuilder.JoinQueryInfos.Last());
result.QueryBuilder.AsTables = oldAsName;
}
return result;
}

6
Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs
View File

@ -538,7 +538,7 @@ namespace SqlSugar
break;
case DbType.HANA:
Check.Exception(SugarCompatible.IsFramework, "NANA only support .net core");
InstanceFactory.CustomDllName = "SqlSugar.HanaConnector";
InstanceFactory.CustomDllName = "SqlSugar.HANAConnector";
break;
case DbType.Xugu:
Check.Exception(SugarCompatible.IsFramework, "Xugu only support .net core");
@ -549,6 +549,10 @@ namespace SqlSugar
case DbType.GoldenDB:
config.DbType = DbType.MySql;
break;
case DbType.DB2:
Check.Exception(SugarCompatible.IsFramework, "Db2 only support .net core");
InstanceFactory.CustomDllName = "SqlSugar.Db2Core";
break;
default:
throw new Exception("ConnectionConfig.DbType is null");
}

1
Src/Asp.Net/SqlSugar/Enum/DbType.cs
View File

@ -36,6 +36,7 @@ namespace SqlSugar
TDSQLForPGODBC,
TDSQL,
HANA,
DB2,
Custom =900
}
}

10
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve_Item.cs
View File

@ -262,6 +262,16 @@ namespace SqlSugar
var value = GetNewExpressionValue(item);
parameter.Context.Result.Append($" {value} AS {asName} ");
}
else if (item is ConditionalExpression)
{
var value = GetNewExpressionValue(item);
parameter.Context.Result.Append($" {value} AS {asName} ");
}
else if (ExpressionTool.GetMethodName(item)==nameof(SqlFunc.IIF))
{
var value = GetNewExpressionValue(item);
parameter.Context.Result.Append($" {value} AS {asName} ");
}
else
{
asName = GetAsNameResolveAnObject(parameter, item, asName, isSameType);

4
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
View File

@ -144,6 +144,10 @@ namespace SqlSugar
var leftString = GetNewExpressionValue(expression.Left);
var RightString = GetNewExpressionValue(expression.Right);
var joinString = this.Context.DbMehtods.MergeString(leftString, RightString);
if (this.Context is KdbndpExpressionContext&&this.Context?.SugarContext?.Context?.CurrentConnectionConfig?.MoreSettings?.DatabaseModel==DbType.SqlServer)
{
joinString = new SqlServerMethod().MergeString(leftString, RightString);
}
if (this.Context.Result.Contains(ExpressionConst.FormatSymbol))
{
base.Context.Result.Replace("{0}", $" {joinString} ");

9
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs
View File

@ -780,7 +780,14 @@ namespace SqlSugar
string shortName = expression.Expression.ToString();
string fieldName = expression.Member.Name;
fieldName = this.Context.GetDbColumnName(expression.Expression.Type.Name, fieldName);
fieldName = Context.GetTranslationColumnName(shortName + UtilConstants.Dot + fieldName);
if (UtilMethods.GetMoreSetting(this.Context).IsCorrectErrorSqlParameterName)
{
fieldName = Context.GetTranslationColumnName(shortName) + UtilConstants.Dot + Context.GetTranslationColumnName(fieldName);
}
else
{
fieldName = Context.GetTranslationColumnName(shortName + UtilConstants.Dot + fieldName);
}
return fieldName;
}

12
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
View File

@ -186,6 +186,10 @@ namespace SqlSugar
{
var asName = this.context.GetTranslationTableName(asItems.First().Replace(subKey, ""), false);
var repKey = $"\\{this.context.SqlTranslationLeft}.+\\{this.context.SqlTranslationRight}";
if (this.context.IsSingle&&this.context.JoinIndex==0&&this.context.CurrentShortName.HasValue()&& isAsAttr&& !asName.Contains(this.context.CurrentShortName))
{
asName = asName + " " + this.context.CurrentShortName+" ";
}
sqlItems[i] = Regex.Replace(sqlItems[i], repKey, asName);
}
}
@ -196,7 +200,13 @@ namespace SqlSugar
{
if (sqlItems[i].StartsWith("FROM " + this.context.SqlTranslationLeft))
{
sqlItems[i] = sqlItems[i]+" "+this.context.CurrentShortName +" ";
if (isAsAttr&&sqlItems[i].EndsWith(this.context.CurrentShortName + " "))
{
}
else
{
sqlItems[i] = sqlItems[i] + " " + this.context.CurrentShortName + " ";
}
}
}
}

8
Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs
View File

@ -436,6 +436,14 @@ namespace SqlSugar
{
return CustomNamespace + "."+CustomDbName + name;
}
else if (type == "HANA")
{
return InstanceFactory.CustomDllName + "." + type + name;
}
else if (type == "DB2")
{
return "SqlSugar.DB2."+ type+ name;
}
else
{
//if (!string.IsNullOrEmpty(CustomDllName))

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

@ -1821,5 +1821,10 @@ namespace SqlSugar
}
return true;
}
internal static ConnMoreSettings GetMoreSetting(ExpressionContext context)
{
return context?.SugarContext?.Context?.CurrentConnectionConfig?.MoreSettings ?? new ConnMoreSettings();
}
}
}