lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-06-28 13:34:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronized code

Browse Source
This commit is contained in:
sunkaixuan 2024-12-06 19:00:14 +08:00
parent 81e53108fd
commit 41a3d80083
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,6 +536,10 @@ namespace SqlSugar
Check.Exception(SugarCompatible.IsFramework, "TDengine only support .net core"); Check.Exception(SugarCompatible.IsFramework, "TDengine only support .net core");
InstanceFactory.CustomDllName = SugarCompatible.IsFramework ? "SqlSugar.TDengine" : "SqlSugar.TDengineCore"; InstanceFactory.CustomDllName = SugarCompatible.IsFramework ? "SqlSugar.TDengine" : "SqlSugar.TDengineCore";
break; break;
case DbType.HANA:
Check.Exception(SugarCompatible.IsFramework, "NANA only support .net core");
InstanceFactory.CustomDllName = "SqlSugar.HanaConnector";
break;
case DbType.Xugu: case DbType.Xugu:
Check.Exception(SugarCompatible.IsFramework, "Xugu only support .net core"); Check.Exception(SugarCompatible.IsFramework, "Xugu only support .net core");
//InstanceFactory.CustomDbName = "Xugu"; //InstanceFactory.CustomDbName = "Xugu";

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

@ -35,6 +35,7 @@ namespace SqlSugar
GoldenDB, GoldenDB,
TDSQLForPGODBC, TDSQLForPGODBC,
TDSQL, TDSQL,
HANA,
Custom =900 Custom =900
} }
} }

8
Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs
View File

@ -140,11 +140,19 @@ namespace SqlSugar
inValues.Add(inStr); inValues.Add(inStr);
} }
else else
{
if (item is string &&item.HasValue() && model?.Conext?.SugarContext?.Context?.CurrentConnectionConfig?.DbType == DbType.MySql)
{
var newValue= item.ToString().Replace("\\", "\\\\");
inValues.Add(newValue);
}
else
{ {
inValues.Add(item); inValues.Add(item);
} }
} }
} }
}
var value = model.Args[1].MemberName; var value = model.Args[1].MemberName;
string inValueString = null; string inValueString = null;
var isNvarchar = model.Args.Count == 3; var isNvarchar = model.Args.Count == 3;

5
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpressionN.cs
View File

@ -47,6 +47,7 @@ namespace SqlSugar
var memberInfo = this.items.Where(it => it.Type == 1).First(); var memberInfo = this.items.Where(it => it.Type == 1).First();
var subInfos = this.items.Where(it => it.Type == 2).Reverse().ToList(); var subInfos = this.items.Where(it => it.Type == 2).Reverse().ToList();
var formInfo = subInfos.First(); var formInfo = subInfos.First();
var rootWhereSql = formInfo?.Nav?.WhereSql;
var joinInfos = subInfos.Skip(1).ToList(); var joinInfos = subInfos.Skip(1).ToList();
var i = 0; var i = 0;
var masterShortName = formInfo.ThisEntityInfo.DbTableName + i; var masterShortName = formInfo.ThisEntityInfo.DbTableName + i;
@ -80,6 +81,10 @@ namespace SqlSugar
} }
var selectProperyInfo = ExpressionTool.GetMemberName(memberInfo.Expression); var selectProperyInfo = ExpressionTool.GetMemberName(memberInfo.Expression);
var selectColumnInfo = memberInfo.ParentEntityInfo.Columns.First(it => it.PropertyName == selectProperyInfo); var selectColumnInfo = memberInfo.ParentEntityInfo.Columns.First(it => it.PropertyName == selectProperyInfo);
if (rootWhereSql?.HasValue() == true)
{
queryable.Where(rootWhereSql);
}
queryable.Select($" {ToShortName(lastShortName)}.{queryable.SqlBuilder.GetTranslationColumnName(selectColumnInfo.DbColumnName)}"); queryable.Select($" {ToShortName(lastShortName)}.{queryable.SqlBuilder.GetTranslationColumnName(selectColumnInfo.DbColumnName)}");
var last = subInfos.First(); var last = subInfos.First();
var FirstPkColumn = last.ThisEntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey); var FirstPkColumn = last.ThisEntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey);